* liboil/math/math.c: split math.c into ref/ and math/ versions.

* liboil/ref/Makefile.am:
* liboil/ref/math.c:

4 files changed, 196 insertions, 150 deletions

diff --git a/ChangeLog b/ChangeLog
index e47ca54..4d0a592 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-12  David Schleef  <ds@schleef.org>
+
+	* liboil/math/math.c: split math.c into ref/ and math/ versions.
+	* liboil/ref/Makefile.am:
+	* liboil/ref/math.c:
+
 2005-11-11  David Schleef  <ds@schleef.org>
 
 	* doc/liboil-sections.txt: Documentation?  Is he MAD?
diff --git a/liboil/math/math.c b/liboil/math/math.c
index 817c395..5b7d727 100644
--- a/liboil/math/math.c
+++ b/liboil/math/math.c
@@ -33,134 +33,7 @@
 
 #include <liboil/liboil.h>
 #include <liboil/liboilfunction.h>
-#include <liboil/liboiltest.h>
-
-
-OIL_DEFINE_CLASS (add_f32, "float *d, float *s1, float *s2, int n");
-OIL_DEFINE_CLASS (subtract_f32, "float *d, float *s1, float *s2, int n");
-OIL_DEFINE_CLASS (multiply_f32, "float *d, float *s1, float *s2, int n");
-OIL_DEFINE_CLASS (divide_f32, "float *d, float *s1, float *s2, int n");
-OIL_DEFINE_CLASS (minimum_f32, "float *d, float *s1, float *s2, int n");
-OIL_DEFINE_CLASS (maximum_f32, "float *d, float *s1, float *s2, int n");
-
-OIL_DEFINE_CLASS (negative_f32, "float *d, float *s, int n");
-OIL_DEFINE_CLASS (inverse_f32, "float *d, float *s, int n");
-OIL_DEFINE_CLASS (sign_f32, "float *d, float *s, int n");
-OIL_DEFINE_CLASS (floor_f32, "float *d, float *s, int n");
-
-OIL_DEFINE_CLASS (scalaradd_f32_ns, "float *d, float *s1, float *s2_1, int n");
-OIL_DEFINE_CLASS (scalarmultiply_f32_ns, "float *d, float *s1, float *s2_1, int n");
-
-static void
-add_f32_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = src1[i] + src2[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (add_f32_ref, add_f32);
-
-static void
-subtract_f32_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = src1[i] - src2[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (subtract_f32_ref, subtract_f32);
-
-static void
-multiply_f32_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = src1[i] * src2[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (multiply_f32_ref, multiply_f32);
-
-static void
-divide_f32_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = src1[i] / src2[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (divide_f32_ref, divide_f32);
-
-static void
-minimum_f32_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = (src1[i] < src2[i]) ? src1[i] : src2[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (minimum_f32_ref, minimum_f32);
-
-static void
-maximum_f32_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = (src1[i] > src2[i]) ? src1[i] : src2[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (maximum_f32_ref, maximum_f32);
-
-static void
-negative_f32_ref (float *dest, float *src1, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = -src1[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (negative_f32_ref, negative_f32);
-
-static void
-inverse_f32_ref (float *dest, float *src1, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = 1.0/src1[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (inverse_f32_ref, inverse_f32);
-
-static void
-sign_f32_ref (float *dest, float *src1, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = (src1[i] < 0) ? -src1[i] : src1[i];
-  }
-}
-OIL_DEFINE_IMPL_REF (sign_f32_ref, sign_f32);
-
-static void
-floor_f32_ref (float *dest, float *src1, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = floor(src1[i]);
-  }
-}
-OIL_DEFINE_IMPL_REF (floor_f32_ref, floor_f32);
-
+#include <liboil/liboilclasses.h>
 
 
 static void
@@ -197,28 +70,6 @@ add_f32_unroll4b (float *dest, float *src1, float *src2, int n)
 }
 OIL_DEFINE_IMPL (add_f32_unroll4b, add_f32);
 
-static void
-scalaradd_f32_ns_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = src1[i] + src2[0];
-  }
-}
-OIL_DEFINE_IMPL_REF (scalaradd_f32_ns_ref, scalaradd_f32_ns);
-
-static void
-scalarmultiply_f32_ns_ref (float *dest, float *src1, float *src2, int n)
-{
-  int i;
-
-  for(i=0;i<n;i++){
-    dest[i] = src1[i] * src2[0];
-  }
-}
-OIL_DEFINE_IMPL_REF (scalarmultiply_f32_ns_ref, scalarmultiply_f32_ns);
-
 
 static void
 multiply_f32_unroll4 (float *dest, float *src1, float *src2, int n)
diff --git a/liboil/ref/Makefile.am b/liboil/ref/Makefile.am
index cede104..dee32f0 100644
--- a/liboil/ref/Makefile.am
+++ b/liboil/ref/Makefile.am
@@ -20,6 +20,7 @@ c_sources = \
 	diff8x8.c \
 	diffsquaresum_f64.c \
 	error8x8.c \
+	math.c \
 	mix_u8.c \
 	mult8x8_s16.c \
 	multsum.c \
diff --git a/liboil/ref/math.c b/liboil/ref/math.c
new file mode 100644
index 0000000..e2c4744
--- /dev/null
+++ b/liboil/ref/math.c
@@ -0,0 +1,188 @@
+/*
+ * LIBOIL - Library of Optimized Inner Loops
+ * Copyright (c) 2005 David A. Schleef <ds@schleef.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+
+#include <liboil/liboil.h>
+#include <liboil/liboilfunction.h>
+#include <liboil/liboiltest.h>
+
+
+OIL_DEFINE_CLASS (add_f32, "float *d, float *s1, float *s2, int n");
+OIL_DEFINE_CLASS (subtract_f32, "float *d, float *s1, float *s2, int n");
+OIL_DEFINE_CLASS (multiply_f32, "float *d, float *s1, float *s2, int n");
+OIL_DEFINE_CLASS (divide_f32, "float *d, float *s1, float *s2, int n");
+OIL_DEFINE_CLASS (minimum_f32, "float *d, float *s1, float *s2, int n");
+OIL_DEFINE_CLASS (maximum_f32, "float *d, float *s1, float *s2, int n");
+
+OIL_DEFINE_CLASS (negative_f32, "float *d, float *s, int n");
+OIL_DEFINE_CLASS (inverse_f32, "float *d, float *s, int n");
+OIL_DEFINE_CLASS (sign_f32, "float *d, float *s, int n");
+OIL_DEFINE_CLASS (floor_f32, "float *d, float *s, int n");
+
+OIL_DEFINE_CLASS (scalaradd_f32_ns, "float *d, float *s1, float *s2_1, int n");
+OIL_DEFINE_CLASS (scalarmultiply_f32_ns, "float *d, float *s1, float *s2_1, int n");
+
+static void
+add_f32_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = src1[i] + src2[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (add_f32_ref, add_f32);
+
+static void
+subtract_f32_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = src1[i] - src2[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (subtract_f32_ref, subtract_f32);
+
+static void
+multiply_f32_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = src1[i] * src2[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (multiply_f32_ref, multiply_f32);
+
+static void
+divide_f32_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = src1[i] / src2[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (divide_f32_ref, divide_f32);
+
+static void
+minimum_f32_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = (src1[i] < src2[i]) ? src1[i] : src2[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (minimum_f32_ref, minimum_f32);
+
+static void
+maximum_f32_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = (src1[i] > src2[i]) ? src1[i] : src2[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (maximum_f32_ref, maximum_f32);
+
+static void
+negative_f32_ref (float *dest, float *src1, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = -src1[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (negative_f32_ref, negative_f32);
+
+static void
+inverse_f32_ref (float *dest, float *src1, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = 1.0/src1[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (inverse_f32_ref, inverse_f32);
+
+static void
+sign_f32_ref (float *dest, float *src1, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = (src1[i] < 0) ? -src1[i] : src1[i];
+  }
+}
+OIL_DEFINE_IMPL_REF (sign_f32_ref, sign_f32);
+
+static void
+floor_f32_ref (float *dest, float *src1, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = floor(src1[i]);
+  }
+}
+OIL_DEFINE_IMPL_REF (floor_f32_ref, floor_f32);
+
+
+
+static void
+scalaradd_f32_ns_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = src1[i] + src2[0];
+  }
+}
+OIL_DEFINE_IMPL_REF (scalaradd_f32_ns_ref, scalaradd_f32_ns);
+
+static void
+scalarmultiply_f32_ns_ref (float *dest, float *src1, float *src2, int n)
+{
+  int i;
+
+  for(i=0;i<n;i++){
+    dest[i] = src1[i] * src2[0];
+  }
+}
+OIL_DEFINE_IMPL_REF (scalarmultiply_f32_ns_ref, scalarmultiply_f32_ns);
+
+