Changeset 41137 for branches/eam_branches/ipp-20191011/Ohana/src/opihi/lib.shell/stack_math.c

Timestamp:

Nov 26, 2019, 8:48:49 AM (7 years ago)

Author:

eugene

Message:

adding bitshift operators

File:

• branches/eam_branches/ipp-20191011/Ohana/src/opihi/lib.shell/stack_math.c (modified) (4 diffs)

branches/eam_branches/ipp-20191011/Ohana/src/opihi/lib.shell/stack_math.c

@@ -357 +357 @@
     case 'A': VV_FUNC(ST_SCALAR_INT, (*M1 && *M2) ? 1 : 0);
     case 'O': VV_FUNC(ST_SCALAR_INT, (*M1 || *M2) ? 1 : 0);
+
+    case 'l': {
+      if ((V1->vector->type == OPIHI_FLT) || (V2->vector->type == OPIHI_FLT)) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V1[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      // I could just do this for all types and bitshift regardless...
+      opihi_int *M1  =  V1[0].vector[0].elements.Int;
+      opihi_int *M2  =  V2[0].vector[0].elements.Int;
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 << *M2;
+      }
+      break;
+    }
+
+    case 'r': {
+      if ((V1->vector->type == OPIHI_FLT) || (V2->vector->type == OPIHI_FLT)) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V1[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      // I could just do this for all types and bitshift regardless...
+      opihi_int *M1  =  V1[0].vector[0].elements.Int;
+      opihi_int *M2  =  V2[0].vector[0].elements.Int;
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 >> *M2;
+      }
+      break;
+    }
+
     default:
       snprintf (line, 512, "error: op %c not defined!", op[0]);
@@ -469 +508 @@
     case 'A': SV_FUNC(ST_SCALAR_INT, (M1 && *M2) ? 1 : 0);
     case 'O': SV_FUNC(ST_SCALAR_INT, (M1 || *M2) ? 1 : 0);
+
+    case 'l': {
+      if (V2->vector->type == OPIHI_FLT) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V2[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      opihi_int  M1  =  V1[0].IntValue;                                 \
+      opihi_int *M2  =  V2[0].vector[0].elements.Int;
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M2++) {
+        *out = M1 << *M2;
+      }
+      break;
+    }
+
+    case 'r': {
+      if (V2->vector->type == OPIHI_FLT) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V2[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      opihi_int  M1  =  V1[0].IntValue;                                 \
+      opihi_int *M2  =  V2[0].vector[0].elements.Int;
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M2++) {
+        *out = M1 >> *M2;
+      }
+      break;
+    }
+
     default:
       snprintf (line, 512, "error: op %c not defined!", op[0]);
@@ -577 +653 @@
     case 'A': VS_FUNC(ST_SCALAR_INT, (*M1 && M2) ? 1 : 0);
     case 'O': VS_FUNC(ST_SCALAR_INT, (*M1 || M2) ? 1 : 0);
+
+    case 'l': {
+      if (V1->vector->type == OPIHI_FLT) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V1[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      opihi_int *M1  =  V1[0].vector[0].elements.Int;
+      opihi_int  M2  =  V2[0].IntValue;                                 \
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M1++) {
+        *out = *M1 << M2;
+      }
+      break;
+    }
+
+    case 'r': {
+      if (V1->vector->type == OPIHI_FLT) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V1[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      opihi_int *M1  =  V1[0].vector[0].elements.Int;
+      opihi_int  M2  =  V2[0].IntValue;                                 \
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M1++) {
+        *out = *M1 >> M2;
+      }
+      break;
+    }
+
     default:
       snprintf (line, 512, "error: op %c not defined!", op[0]);
@@ -670 +783 @@
     case 'A': MV_FUNC((*M1 && *M2) ? 1 : 0);
     case 'O': MV_FUNC((*M1 || *M2) ? 1 : 0);
+
+    case 'l': {
+      if (V1->vector->type == OPIHI_FLT) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V1[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      opihi_int *M1  =  V1[0].vector[0].elements.Int;
+      opihi_int  M2  =  V2[0].IntValue;                                 \
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M1++) {
+        *out = *M1 << M2;
+      }
+      break;
+    }
+
+    case 'r': {
+      if (V1->vector->type == OPIHI_FLT) {
+        // bitshift is not valid with float valuess
+        CopyVector (OUT[0].vector, V1[0].vector);
+        for (i = 0; i < Nx; i++) {
+          OUT[0].vector[0].elements.Flt[i] = NAN;
+        }
+        break;
+      }
+      opihi_int *M1  =  V1[0].vector[0].elements.Int;
+      opihi_int  M2  =  V2[0].IntValue;                                 \
+      opihi_int *out = OUT[0].vector[0].elements.Int;
+      for (i = 0; i < Nx; i++, out++, M1++) {
+        *out = *M1 >> M2;
+      }
+      break;
+    }
+
     default:
       snprintf (line, 512, "error: op %c not defined!", op[0]);