Fix testing of float params

diff --git a/orc-test/orctest.c b/orc-test/orctest.c
index c9b873e268b84364a48a3622a8db89d105070f73..f4a66dc4018700fda917ec56472fc40aeec9bfb3 100644 (file)
--- a/orc-test/orctest.c
+++ b/orc-test/orctest.c
@@ -568,7 +568,11 @@ orc_test_compare_output_full (OrcProgram *program, int flags)
       orc_array_set_pattern (dest_emul[i], ORC_OOB_VALUE);
       misalignment++;
     } else if (program->vars[i].vartype == ORC_VAR_TYPE_PARAM) {
-      orc_executor_set_param (ex, i, 2);
+      if (program->vars[i].is_float_param) {
+        orc_executor_set_param_float (ex, i, 2.0);
+      } else {
+        orc_executor_set_param (ex, i, 2);
+      }
     }
   }
 

diff --git a/orc/orcexecutor.c b/orc/orcexecutor.c
index df2ed948be724e56aed327fcb1fa27658a9ef608..fef9e67ce1d253432e33dce249b2eb46404d1c92 100644 (file)
--- a/orc/orcexecutor.c
+++ b/orc/orcexecutor.c
@@ -100,6 +100,14 @@ orc_executor_set_param (OrcExecutor *ex, int var, int value)
   ex->params[var] = value;
 }
 
+void
+orc_executor_set_param_float (OrcExecutor *ex, int var, float value)
+{
+  orc_union32 u;
+  u.f = value;
+  ex->params[var] = u.i;
+}
+
 void
 orc_executor_set_param_str (OrcExecutor *ex, const char *name, int value)
 {

diff --git a/orc/orcprogram.h b/orc/orcprogram.h
index 13d56ed81cb8e64dd9f6c18c28fd22fc15733564..6cbe43b59fd7a1bf2f2bc08aa664cd3d54ef8a49 100644 (file)
--- a/orc/orcprogram.h
+++ b/orc/orcprogram.h
@@ -640,6 +640,7 @@ void orc_executor_set_stride (OrcExecutor *ex, int var, int stride);
 void orc_executor_set_array_str (OrcExecutor *ex, const char *name, void *ptr);
 void orc_executor_set_param (OrcExecutor *ex, int var, int value);
 void orc_executor_set_param_str (OrcExecutor *ex, const char *name, int value);
+void orc_executor_set_param_float (OrcExecutor *ex, int var, float value);
 int orc_executor_get_accumulator (OrcExecutor *ex, int var);
 int orc_executor_get_accumulator_str (OrcExecutor *ex, const char *name);
 void orc_executor_set_n (OrcExecutor *ex, int n);

diff --git a/testsuite/show_parse.c b/testsuite/show_parse.c
index 45ee92d6d59a4853881f9001fb200e634f2f802d..b93269181e7a9fb07955db7bd0a0fcc5f2e88717 100644 (file)
--- a/testsuite/show_parse.c
+++ b/testsuite/show_parse.c
@@ -285,7 +285,11 @@ show (OrcProgram *program)
       dest[i-ORC_VAR_D1] = orc_array_new (n, m, program->vars[i].size, 0);
       orc_array_set_pattern (dest[i], ORC_OOB_VALUE);
     } else if (program->vars[i].vartype == ORC_VAR_TYPE_PARAM) {
-      orc_executor_set_param (ex, i, 2);
+      if (program->vars[i].is_float_param) {
+        orc_executor_set_param_float (ex, i, 2.0);
+      } else {
+        orc_executor_set_param (ex, i, 2);
+      }
     }
   }