fix tailMul by renaming complex mad() to cfma() to avoid name confict

preda · Aug 30, 2024 · af8db20 · af8db20
1 parent fe11a0a
commit af8db20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/bundle.cpp b/src/bundle.cpp
@@ -2256,11 +2256,11 @@ OVERLOAD T2 fancyMul(T2 x, const T2 y) {
 }
 
 // fma(x, y, z); }
-OVERLOAD double mad(double x, double y, double z) { return x * y + z; }
+// OVERLOAD double mad(double x, double y, double z) { return x * y + z; }
 
 // complex fma
-OVERLOAD T2 mad(T2 a, T2 b, T2 c) {
-  return U2(mad(a.x, b.x, mad(a.y, -b.y, c.x)), mad(a.x, b.y, mad(a.y, b.x, c.y)));
+T2 cfma(T2 a, T2 b, T2 c) {
+  return U2(fma(a.x, b.x, fma(a.y, -b.y, c.x)), fma(a.x, b.y, fma(a.y, b.x, c.y)));
 }
 
 // complex square
@@ -2463,8 +2463,8 @@ void onePairMul(T2* pa, T2* pb, T2* pc, T2* pd, T2 conjugate_t_squared) {
 
   T2 tmp = a;
 
-  a = mad(a, c, mul(mul(b, d), conjugate_t_squared));
-  b = mad(b, c, mul(tmp, d));
+  a = cfma(a, c, mul(mul(b, d), conjugate_t_squared));
+  b = cfma(b, c, mul(tmp, d));
 
   X2conja(a, b);
 

diff --git a/src/cl/math.cl b/src/cl/math.cl
@@ -16,11 +16,11 @@ OVERLOAD T2 fancyMul(T2 x, const T2 y) {
 }
 
 // fma(x, y, z); }
-OVERLOAD double mad(double x, double y, double z) { return x * y + z; }
+// OVERLOAD double mad(double x, double y, double z) { return x * y + z; }
 
 // complex fma
-OVERLOAD T2 mad(T2 a, T2 b, T2 c) {
-  return U2(mad(a.x, b.x, mad(a.y, -b.y, c.x)), mad(a.x, b.y, mad(a.y, b.x, c.y)));
+T2 cfma(T2 a, T2 b, T2 c) {
+  return U2(fma(a.x, b.x, fma(a.y, -b.y, c.x)), fma(a.x, b.y, fma(a.y, b.x, c.y)));
 }
 
 // complex square

diff --git a/src/cl/tailmul.cl b/src/cl/tailmul.cl
@@ -24,8 +24,8 @@ void onePairMul(T2* pa, T2* pb, T2* pc, T2* pd, T2 conjugate_t_squared) {
 
   T2 tmp = a;
 
-  a = mad(a, c, mul(mul(b, d), conjugate_t_squared));
-  b = mad(b, c, mul(tmp, d));
+  a = cfma(a, c, mul(mul(b, d), conjugate_t_squared));
+  b = cfma(b, c, mul(tmp, d));
 
   X2conja(a, b);