tests: handle scalar opcodes in perf test

1 files changed, 5 insertions, 254 deletions

diff --git a/testsuite/perf_opcodes_sys.c b/testsuite/perf_opcodes_sys.c
index 3120beb..abfe4a0 100644
--- a/testsuite/perf_opcodes_sys.c
+++ b/testsuite/perf_opcodes_sys.c
@@ -10,12 +10,6 @@
 int error = FALSE;
 
 void test_opcode_src (OrcStaticOpcode *opcode);
-void test_opcode_const (OrcStaticOpcode *opcode);
-void test_opcode_param (OrcStaticOpcode *opcode);
-void test_opcode_inplace (OrcStaticOpcode *opcode);
-void test_opcode_src_2d (OrcStaticOpcode *opcode);
-void test_opcode_src_const_n (OrcStaticOpcode *opcode);
-void test_opcode_src_const_n_2d (OrcStaticOpcode *opcode);
 
 int
 main (int argc, char *argv[])
@@ -32,56 +26,6 @@ main (int argc, char *argv[])
     printf("opcode_%-20s ", opcode_set->opcodes[i].name);
     test_opcode_src (opcode_set->opcodes + i);
   }
-#if 0
-  for(i=0;i<opcode_set->n_opcodes;i++){
-    printf("/* %s const %d,%d,%d */\n",
-        opcode_set->opcodes[i].name,
-        opcode_set->opcodes[i].dest_size[0],
-        opcode_set->opcodes[i].src_size[0],
-        opcode_set->opcodes[i].src_size[1]);
-    test_opcode_const (opcode_set->opcodes + i);
-  }
-  for(i=0;i<opcode_set->n_opcodes;i++){
-    printf("/* %s param %d,%d,%d */\n",
-        opcode_set->opcodes[i].name,
-        opcode_set->opcodes[i].dest_size[0],
-        opcode_set->opcodes[i].src_size[0],
-        opcode_set->opcodes[i].src_size[1]);
-    test_opcode_param (opcode_set->opcodes + i);
-  }
-  for(i=0;i<opcode_set->n_opcodes;i++){
-    printf("/* %s inplace %d,%d,%d */\n",
-        opcode_set->opcodes[i].name,
-        opcode_set->opcodes[i].dest_size[0],
-        opcode_set->opcodes[i].src_size[0],
-        opcode_set->opcodes[i].src_size[1]);
-    test_opcode_inplace (opcode_set->opcodes + i);
-  }
-  for(i=0;i<opcode_set->n_opcodes;i++){
-    printf("/* %s src 2d %d,%d,%d */\n",
-        opcode_set->opcodes[i].name,
-        opcode_set->opcodes[i].dest_size[0],
-        opcode_set->opcodes[i].src_size[0],
-        opcode_set->opcodes[i].src_size[1]);
-    test_opcode_src_2d (opcode_set->opcodes + i);
-  }
-  for(i=0;i<opcode_set->n_opcodes;i++){
-    printf("/* %s src const n %d,%d,%d */\n",
-        opcode_set->opcodes[i].name,
-        opcode_set->opcodes[i].dest_size[0],
-        opcode_set->opcodes[i].src_size[0],
-        opcode_set->opcodes[i].src_size[1]);
-    test_opcode_src_const_n (opcode_set->opcodes + i);
-  }
-  for(i=0;i<opcode_set->n_opcodes;i++){
-    printf("/* %s src const n 2d %d,%d,%d */\n",
-        opcode_set->opcodes[i].name,
-        opcode_set->opcodes[i].dest_size[0],
-        opcode_set->opcodes[i].src_size[0],
-        opcode_set->opcodes[i].src_size[1]);
-    test_opcode_src_const_n_2d (opcode_set->opcodes + i);
-  }
-#endif
 
   if (error) return 1;
   return 0;
@@ -101,7 +45,11 @@ test_opcode_src (OrcStaticOpcode *opcode)
   }
   orc_program_add_source (p, opcode->src_size[0], "s1");
   if (opcode->src_size[1] != 0) {
-    orc_program_add_source (p, opcode->src_size[1], "s2");
+    if (opcode->flags & ORC_STATIC_OPCODE_SCALAR) {
+      orc_program_add_constant (p, opcode->src_size[1], 1, "s2");
+    } else {
+      orc_program_add_source (p, opcode->src_size[1], "s2");
+    }
   }
 
   if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
@@ -123,200 +71,3 @@ test_opcode_src (OrcStaticOpcode *opcode)
   orc_program_free (p);
 }
 
-#if 0
-void
-test_opcode_const (OrcStaticOpcode *opcode)
-{
-  OrcProgram *p;
-  char s[40];
-  int ret;
-  int flags = 0;
-
-  if (opcode->src_size[1] == 0) {
-    return;
-  }
-  p = orc_program_new_ds (opcode->dest_size[0], opcode->src_size[0]);
-  orc_program_add_constant (p, opcode->src_size[1], 1, "c1");
-  if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
-      (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
-    flags = ORC_TEST_FLAGS_FLOAT;
-  }
-
-  sprintf(s, "test_c_%s", opcode->name);
-  orc_program_set_name (p, s);
-
-  orc_program_append_str (p, opcode->name, "d1", "s1", "c1");
-
-  ret = orc_test_compare_output_full (p, flags);
-  if (!ret) {
-    error = TRUE;
-  }
-
-  orc_program_free (p);
-}
-
-void
-test_opcode_param (OrcStaticOpcode *opcode)
-{
-  OrcProgram *p;
-  char s[40];
-  int ret;
-  int flags = 0;
-
-  if (opcode->src_size[1] == 0) {
-    return;
-  }
-  p = orc_program_new_ds (opcode->dest_size[0], opcode->src_size[0]);
-  orc_program_add_parameter (p, opcode->src_size[1], "p1");
-  if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
-      (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
-    flags = ORC_TEST_FLAGS_FLOAT;
-  }
-
-  sprintf(s, "test_c_%s", opcode->name);
-  orc_program_set_name (p, s);
-
-  orc_program_append_str (p, opcode->name, "d1", "s1", "p1");
-
-  ret = orc_test_compare_output_full (p, flags);
-  if (!ret) {
-    error = TRUE;
-  }
-
-  orc_program_free (p);
-}
-
-void
-test_opcode_inplace (OrcStaticOpcode *opcode)
-{
-  OrcProgram *p;
-  char s[40];
-  int ret;
-  int flags = 0;
-
-  if (opcode->dest_size[0] != opcode->src_size[0]) return;
-
-  if (opcode->src_size[1] == 0) {
-    p = orc_program_new_ds (opcode->dest_size[0], opcode->src_size[0]);
-  } else {
-    p = orc_program_new_dss (opcode->dest_size[0], opcode->src_size[0],
-        opcode->src_size[1]);
-  }
-  if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
-      (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
-    flags = ORC_TEST_FLAGS_FLOAT;
-  }
-
-  sprintf(s, "test_inplace_%s", opcode->name);
-  orc_program_set_name (p, s);
-
-  orc_program_append_str (p, opcode->name, "d1", "d1", "s2");
-
-  ret = orc_test_compare_output_full (p, flags);
-  if (!ret) {
-    error = TRUE;
-  }
-
-  orc_program_free (p);
-}
-
-void
-test_opcode_src_2d (OrcStaticOpcode *opcode)
-{
-  OrcProgram *p;
-  char s[40];
-  int ret;
-  int flags = 0;
-
-  if (opcode->src_size[1] == 0) {
-    p = orc_program_new_ds (opcode->dest_size[0], opcode->src_size[0]);
-  } else {
-    p = orc_program_new_dss (opcode->dest_size[0], opcode->src_size[0],
-        opcode->src_size[1]);
-  }
-  if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
-      (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
-    flags = ORC_TEST_FLAGS_FLOAT;
-  }
-
-  sprintf(s, "test_s_%s", opcode->name);
-  orc_program_set_name (p, s);
-  orc_program_set_2d (p);
-
-  orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
-
-  ret = orc_test_compare_output_full (p, flags);
-  if (!ret) {
-    error = TRUE;
-  }
-
-  orc_program_free (p);
-}
-
-void
-test_opcode_src_const_n (OrcStaticOpcode *opcode)
-{
-  OrcProgram *p;
-  char s[40];
-  int ret;
-  int flags = 0;
-
-  if (opcode->src_size[1] == 0) {
-    p = orc_program_new_ds (opcode->dest_size[0], opcode->src_size[0]);
-  } else {
-    p = orc_program_new_dss (opcode->dest_size[0], opcode->src_size[0],
-        opcode->src_size[1]);
-  }
-  if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
-      (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
-    flags = ORC_TEST_FLAGS_FLOAT;
-  }
-
-  sprintf(s, "test_s_%s", opcode->name);
-  orc_program_set_name (p, s);
-  orc_program_set_constant_n (p, 8);
-
-  orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
-
-  ret = orc_test_compare_output_full (p, flags);
-  if (!ret) {
-    error = TRUE;
-  }
-
-  orc_program_free (p);
-}
-
-void
-test_opcode_src_const_n_2d (OrcStaticOpcode *opcode)
-{
-  OrcProgram *p;
-  char s[40];
-  int ret;
-  int flags = 0;
-
-  if (opcode->src_size[1] == 0) {
-    p = orc_program_new_ds (opcode->dest_size[0], opcode->src_size[0]);
-  } else {
-    p = orc_program_new_dss (opcode->dest_size[0], opcode->src_size[0],
-        opcode->src_size[1]);
-  }
-  if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) ||
-      (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) {
-    flags = ORC_TEST_FLAGS_FLOAT;
-  }
-
-  sprintf(s, "test_s_%s", opcode->name);
-  orc_program_set_name (p, s);
-  orc_program_set_2d (p);
-  orc_program_set_constant_n (p, 8);
-
-  orc_program_append_str (p, opcode->name, "d1", "s1", "s2");
-
-  ret = orc_test_compare_output_full (p, flags);
-  if (!ret) {
-    error = TRUE;
-  }
-
-  orc_program_free (p);
-}
-#endif