Changeset 20827 for branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c

Timestamp:

Nov 24, 2008, 5:09:38 PM (18 years ago)

Author:

eugene

Message:

working on double vectors, other additions

File:

• branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c (modified) (1 diff)

branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c

@@ -35 +35 @@
   out = OUT[0].ptr = (float *)OUT[0].vector[0].elements;
 
-  switch (op[0]) { 
+// XXX this is not quite there:
+// 1) do I drop the .ptr element of StackVar?
+// 2) things below are using type from a StackVar to get the vector type -- wrong place
+// 3) the temp would need lots of work -- is it worth it?
+// 4) some operators force the output to be float -- we cannot use a single bit of code to 
+//    define the output type based on which is a float and which is not.  getting ugly.
+// ??? how much more work to bring the MV, etc functions into shape ???
+
+# define VV_FUNC(OP) \
+  if ((M1->type == OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) { \
+    // output must be float, can use either as a temp \
+    opihi_float *M1 = V1[0].vector[0].elements; \
+    opihi_float *M2 = V2[0].vector[0].elements; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  } \
+  if ((M1->type != OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) { \
+    // output must be float, can use M2 as a temp \
+    opihi_float *M1 = V1[0].vector[0].elementsInt; \
+    opihi_float *M2 = V2[0].vector[0].elements; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  } \
+  if ((M1->type == OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) { \
+    // output must be float, can use M1 as a temp \
+    opihi_float *M1 = V1[0].vector[0].elements; \
+    opihi_float *M2 = V2[0].vector[0].elementsInt; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  } \
+  if ((M1->type != OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) { \
+    // output may be int, can use either as temp \
+    opihi_float *M1 = V1[0].vector[0].elementsInt; \
+    opihi_float *M2 = V2[0].vector[0].elementsInt; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  }
+
+  switch (op[0]) {
   case '+': 
-    for (i = 0; i < Nx; i++, out++, M1++, M2++)
-      *out = *M1 + *M2;
-    break; 
+    VV_FUNC
+
+    if ((M1->type == OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) {
+      // output must be float, can use either as a temp
+      M1 = V1[0].vector[0].elements;
+      M2 = V2[0].vector[0].elements;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
+    if ((M1->type != OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) {
+      // output must be float, can use M2 as a temp
+      M1 = V1[0].vector[0].elementsInt;
+      M2 = V2[0].vector[0].elements;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
+    if ((M1->type == OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) {
+      // output must be float, can use M1 as a temp
+      M1 = V1[0].vector[0].elements;
+      M2 = V2[0].vector[0].elementsInt;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
+    if ((M1->type != OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) {
+      // output may be int, can use either as temp
+      M1 = V1[0].vector[0].elementsInt;
+      M2 = V2[0].vector[0].elementsInt;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
   case '-': 
     for (i = 0; i < Nx; i++, out++, M1++, M2++)