glsl: Add heuristics to print floating-point numbers better.

v2: Fix *.expected files to match.
Reviewed-by: Paul Berry <strereotype441@gmail.com>

diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
index 541231a33c1da9bd59b29a20507ec62053437a4d..b5183108d6be5d22150be39fe9607c04cba188f3 100644 (file)
--- a/src/glsl/ir_print_visitor.cpp
+++ b/src/glsl/ir_print_visitor.cpp
@@ -406,7 +406,17 @@ void ir_print_visitor::visit(ir_constant *ir)
         switch (ir->type->base_type) {
         case GLSL_TYPE_UINT:  printf("%u", ir->value.u[i]); break;
         case GLSL_TYPE_INT:   printf("%d", ir->value.i[i]); break;
-        case GLSL_TYPE_FLOAT: printf("%f", ir->value.f[i]); break;
+        case GLSL_TYPE_FLOAT:
+            if (ir->value.f[i] == 0.0f)
+               /* 0.0 == -0.0, so print with %f to get the proper sign. */
+               printf("%.1f", ir->value.f[i]);
+            else if (abs(ir->value.f[i]) < 0.000001f)
+               printf("%a", ir->value.f[i]);
+            else if (abs(ir->value.f[i]) > 1000000.0f)
+               printf("%e", ir->value.f[i]);
+            else
+               printf("%f", ir->value.f[i]);
+            break;
         case GLSL_TYPE_BOOL:  printf("%d", ir->value.b[i]); break;
         default: assert(0);
         }

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
index a4cb2d6a12563fc29706f11a9049d1785d9c1eb4..3771efc7511d35e6a7098e888d670209f852c843 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
@@ -3,5 +3,5 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) (break)
+      (if (expression bool > (var_ref b) (constant float (0.0))) (break)
        ())))))))

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
index 325f7b49a5d1ed055bba15dce035eaef2050c636..afae5e7c77b4ae5c12a80f0301e9253470ffe6ad 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
@@ -3,6 +3,6 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000)))
+      (if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref c) (constant float (1.000000))) break)
        ())))))))

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
index a7735457cb812f9a61f98654b3bd43cb4f191000..588a3f66a531bc83a786b42b1785ef6bd6228d37 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
@@ -3,5 +3,5 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) ()
+      (if (expression bool > (var_ref b) (constant float (0.0))) ()
        (break))))))))

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
index 0dd4a5293838fd240b67134dd23cdc3aa717e1b5..da2d1a2c8200c9b6a59f00650df292bf29f07637 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
@@ -3,5 +3,5 @@
   (signature void (parameters)
    ((loop () () () ()
      ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) ()
+      (if (expression bool > (var_ref b) (constant float (0.0))) ()
        ((assign (x) (var_ref c) (constant float (1.000000))) break))))))))

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
index 8222328e00c743e41bc2c7e5ac8f055a9a188006..9adf8655f238a368accd805098f86108894970f6 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
@@ -8,15 +8,15 @@
     (loop () () () ()
      ((declare (temporary) bool execute_flag)
       (assign (x) (var_ref execute_flag) (constant bool (1)))
-      (if (expression bool > (var_ref a) (constant float (0.000000)))
-       ((if (expression bool > (var_ref ba) (constant float (0.000000)))
-         ((if (expression bool > (var_ref bb) (constant float (0.000000)))
+      (if (expression bool > (var_ref a) (constant float (0.0)))
+       ((if (expression bool > (var_ref ba) (constant float (0.0)))
+         ((if (expression bool > (var_ref bb) (constant float (0.0)))
            ((assign (x) (var_ref execute_flag) (constant bool (0))))
            ()))
          ())
         (if (var_ref execute_flag)
-         ((if (expression bool > (var_ref ca) (constant float (0.000000)))
-           ((if (expression bool > (var_ref cb) (constant float (0.000000)))
+         ((if (expression bool > (var_ref ca) (constant float (0.0)))
+           ((if (expression bool > (var_ref cb) (constant float (0.0)))
              ((assign (x) (var_ref break_flag) (constant bool (1)))
               (assign (x) (var_ref execute_flag) (constant bool (0))))
              ()))

diff --git a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
index 7c6e73f77f82176a42b83005d7a8816fbb2593f2..a69e2b791a6f1ea10a19ac60c03267876022febd 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
@@ -6,13 +6,13 @@
     (loop () () () ()
      ((declare (temporary) bool execute_flag)
       (assign (x) (var_ref execute_flag) (constant bool (1)))
-      (if (expression bool > (var_ref aa) (constant float (0.000000)))
-       ((if (expression bool > (var_ref ab) (constant float (0.000000)))
+      (if (expression bool > (var_ref aa) (constant float (0.0)))
+       ((if (expression bool > (var_ref ab) (constant float (0.0)))
          ((assign (x) (var_ref execute_flag) (constant bool (0))))
          ()))
        ())
       (if (var_ref execute_flag)
-       ((if (expression bool > (var_ref b) (constant float (0.000000)))
+       ((if (expression bool > (var_ref b) (constant float (0.0)))
          ((assign (x) (var_ref break_flag) (constant bool (1)))
           (assign (x) (var_ref execute_flag) (constant bool (0))))
          ()))

diff --git a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
index bf45c2c93b66de919623df8adcd57c898ee8ef0f..b921d307ff68164a6c8a594d6978e31b64d762c8 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
@@ -7,16 +7,16 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref aa) (constant float (0.000000)))
-     ((if (expression bool > (var_ref ab) (constant float (0.000000)))
+    (if (expression bool > (var_ref aa) (constant float (0.0)))
+     ((if (expression bool > (var_ref ab) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))
      ())
     (if (var_ref execute_flag)
      ((loop () () () ()
-       ((if (expression bool > (var_ref b) (constant float (0.000000)))
-         ((if (expression bool > (var_ref c) (constant float (0.000000))) ()
+       ((if (expression bool > (var_ref b) (constant float (0.0)))
+         ((if (expression bool > (var_ref c) (constant float (0.0))) ()
            (continue)))
          ((assign (x) (var_ref return_flag) (constant bool (1)))))
         break))

diff --git a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
index d4835e96b7c92ea40405b1acd654a1171ccd38f9..5b62bbcde99f8a9ef6fccb8199120c3cdfc225e1 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
@@ -6,8 +6,8 @@
     (declare (temporary) float return_value)
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref return_value) (constant float (1.000000)))
         (assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))

diff --git a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
index b551a066f4362341a67cd53301064ecc9bb57a91..07c6842d20c7dccad5e04e7c4f8e50010d4aca33 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
@@ -6,7 +6,7 @@
     (declare (temporary) float return_value)
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
      ((assign (x) (var_ref return_value) (constant float (1.000000)))
       (assign (x) (var_ref return_flag) (constant bool (1)))
       (assign (x) (var_ref execute_flag) (constant bool (0))))

diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
index e8b36f14478791ef9638ee40ac884859fa4c8dea..7e3fe314f96807823a4ae1e0a995679be659f18c 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
@@ -1,8 +1,8 @@
 ((declare (in) float a) (declare (in) float b)
  (function main
   (signature void (parameters)
-   ((if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+   ((if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((return))
        ()))
      ())))))

diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
index e15a97d1db281bf692b3dc3317d0049546b615b8..b47f5a433dec27894265e5f0a0fedb0a6d4a5d88 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
@@ -5,8 +5,8 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))

diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
index 07db6e708f490344fd389ddada8b8ed8edb33d86..7424968b248eb41c08b03f858ce77fc39a76c5fa 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
@@ -1,8 +1,8 @@
 ((declare (in) float a) (declare (in) float b)
  (function sub
   (signature void (parameters)
-   ((if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+   ((if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((return))
        ()))
      ())))))

diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
index 311098023514a7d36b598325fbb251a949ec8e79..1a3eae5da7616fa8d36fceb81ec0df50e659faf2 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
@@ -5,8 +5,8 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
+    (if (expression bool > (var_ref a) (constant float (0.0)))
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))

diff --git a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
index 271cd3b462ec7046f212a98d0f782a110f91efc6..c0b51e1baaa4a39f312efe172835c3fada485175 100644 (file)
--- a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
@@ -6,15 +6,15 @@
     (assign (x) (var_ref execute_flag) (constant bool (1)))
     (declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (if (expression bool > (var_ref aa) (constant float (0.000000)))
-     ((if (expression bool > (var_ref ab) (constant float (0.000000)))
+    (if (expression bool > (var_ref aa) (constant float (0.0)))
+     ((if (expression bool > (var_ref ab) (constant float (0.0)))
        ((assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))
      ())
     (if (var_ref execute_flag)
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
-       ((if (expression bool > (var_ref c) (constant float (0.000000))) () ())
+     ((if (expression bool > (var_ref b) (constant float (0.0)))
+       ((if (expression bool > (var_ref c) (constant float (0.0))) () ())
         (assign (x) (var_ref return_flag) (constant bool (1)))
         (assign (x) (var_ref execute_flag) (constant bool (0))))
        ()))