glsl/loops: Get rid of lower_bounded_loops and ir_loop::normative_bound.

Now that loop_controls no longer creates normatively bound loops,
there is no need for ir_loop::normative_bound or the
lower_bounded_loops pass.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

30 files changed, 30 insertions, 30 deletions

diff --git a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
index c38ed9e..b412ba8 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
@@ -8,6 +8,6 @@
 ((declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) break))))))
 EOF
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test.expected b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test.expected
index b278b1c..56ef3e4 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test.expected
@@ -1,5 +1,5 @@
 ((declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) break))))))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
index a4a94e0..f5de803 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
@@ -8,7 +8,7 @@
 ((declare (in) float b) (declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (if (expression bool > (var_ref b) (constant float (0.000000))) (break)
        ())))))))
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 90156be..dc231f9 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
@@ -1,7 +1,7 @@
 ((declare (in) float b) (declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (if (expression bool > (var_ref b) (constant float (0.0))) (break)
        ())))))))
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
index 4475eea..60368bc 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
@@ -9,7 +9,7 @@
 ((declare (in) float b) (declare (out) float a) (declare (out) float c)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (if (expression bool > (var_ref b) (constant float (0.000000)))
        ((assign (x) (var_ref c) (constant float (1.000000))) 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 e31a712..8131b66 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
@@ -1,7 +1,7 @@
 ((declare (in) float b) (declare (out) float a) (declare (out) float c)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.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 b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
index cb06cfd..cde3197 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
@@ -8,7 +8,7 @@
 ((declare (in) float b) (declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (if (expression bool > (var_ref b) (constant float (0.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 3c216ed..94dcb37 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
@@ -1,7 +1,7 @@
 ((declare (in) float b) (declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.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 b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
index 0a7a112..157b589 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
@@ -9,7 +9,7 @@
 ((declare (in) float b) (declare (out) float a) (declare (out) float c)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (if (expression bool > (var_ref b) (constant float (0.000000))) ()
        ((assign (x) (var_ref c) (constant float (1.000000))) 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 45e718d..5b46ccb 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
@@ -1,7 +1,7 @@
 ((declare (in) float b) (declare (out) float a) (declare (out) float c)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.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 b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
index 4786063..4767df1 100755
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
@@ -12,7 +12,7 @@
  (declare (in) float cb)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((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)))
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 338d751..967ce64 100644
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
@@ -5,7 +5,7 @@
   (signature void (parameters)
    ((declare (temporary) bool break_flag)
     (assign (x) (var_ref break_flag) (constant bool (0)))
-    (loop ()
+    (loop
      ((declare (temporary) bool execute_flag)
       (assign (x) (var_ref execute_flag) (constant bool (1)))
       (if (expression bool > (var_ref a) (constant float (0.0)))
diff --git a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
index 0f84c5d..164914a 100755
--- a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
@@ -10,7 +10,7 @@
 ((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((if (expression bool > (var_ref aa) (constant float (0.000000)))
        ((if (expression bool > (var_ref ab) (constant float (0.000000)))
          (continue)
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 3ce323a..841073e 100644
--- 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
@@ -3,7 +3,7 @@
   (signature void (parameters)
    ((declare (temporary) bool break_flag)
     (assign (x) (var_ref break_flag) (constant bool (0)))
-    (loop ()
+    (loop
      ((declare (temporary) bool execute_flag)
       (assign (x) (var_ref execute_flag) (constant bool (1)))
       (if (expression bool > (var_ref aa) (constant float (0.0)))
diff --git a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
index cebdad7..1a5c096 100755
--- a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
+++ b/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
@@ -19,7 +19,7 @@
        ((return))
        ()))
      ())
-    (loop ()
+    (loop
      ((if (expression bool > (var_ref b) (constant float (0.000000)))
        ((if (expression bool > (var_ref c) (constant float (0.000000))) (break)
          (continue)))
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 e4339b1..cf2ef3f 100644
--- 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
@@ -14,7 +14,7 @@
        ()))
      ())
     (if (var_ref execute_flag)
-     ((loop ()
+     ((loop
        ((if (expression bool > (var_ref b) (constant float (0.0)))
          ((if (expression bool > (var_ref c) (constant float (0.0))) ()
            (continue)))
diff --git a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
index da1caad..8403bb2 100755
--- a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
+++ b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
@@ -8,6 +8,6 @@
 ((declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) continue))))))
 EOF
diff --git a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test.expected b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test.expected
index df2b548..98b74d7 100644
--- a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test.expected
@@ -1,5 +1,5 @@
 ((declare (out) float a)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))))))))
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
index 0b46a79..1f62e73 100755
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
@@ -8,7 +8,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function sub
   (signature float (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (return (constant float (2.000000)))))
     (assign (x) (var_ref b) (constant float (3.000000)))
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test.expected b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test.expected
index a1f3cde..040d383 100644
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test.expected
@@ -1,7 +1,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function sub
   (signature float (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (return (constant float (2.000000)))))
     (assign (x) (var_ref b) (constant float (3.000000)))
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
index 0d73a66..42c4e75 100755
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
@@ -8,7 +8,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function sub
   (signature float (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (return (constant float (2.000000)))))
     (assign (x) (var_ref b) (constant float (3.000000)))
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test.expected b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test.expected
index 52bc99c..792cbf6 100644
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.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)))
-    (loop ()
+    (loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (assign (x) (var_ref return_value) (constant float (2.000000)))
       (assign (x) (var_ref return_flag) (constant bool (1)))
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
index 8b08c99..b3eef39 100755
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
@@ -8,7 +8,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function sub
   (signature float (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (return (constant float (2.000000)))))
     (assign (x) (var_ref b) (constant float (3.000000)))
diff --git a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test.expected b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test.expected
index 52bc99c..792cbf6 100644
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.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)))
-    (loop ()
+    (loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (assign (x) (var_ref return_value) (constant float (2.000000)))
       (assign (x) (var_ref return_flag) (constant bool (1)))
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
index f5b45bc..0408282 100755
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
@@ -8,7 +8,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) (return)))
     (assign (x) (var_ref b) (constant float (2.000000)))))))
 EOF
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test.expected b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test.expected
index ae9359f..569213e 100644
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test.expected
@@ -1,6 +1,6 @@
 ((declare (out) float a) (declare (out) float b)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) (return)))
     (assign (x) (var_ref b) (constant float (2.000000)))))))
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
index 2a02101..a7e65c8 100755
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
@@ -8,7 +8,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) (return)))
     (assign (x) (var_ref b) (constant float (2.000000)))))))
 EOF
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test.expected b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test.expected
index d6dd1db..66f3aec 100644
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test.expected
@@ -3,7 +3,7 @@
   (signature void (parameters)
    ((declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (loop ()
+    (loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (assign (x) (var_ref return_flag) (constant bool (1)))
       break))
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
index 4c6f959..7a5efe5 100755
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
@@ -8,7 +8,7 @@
 ((declare (out) float a) (declare (out) float b)
  (function main
   (signature void (parameters)
-   ((loop ()
+   ((loop
      ((assign (x) (var_ref a) (constant float (1.000000))) (return)))
     (assign (x) (var_ref b) (constant float (2.000000)))))))
 EOF
diff --git a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test.expected b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test.expected
index d6dd1db..66f3aec 100644
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test.expected
+++ b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test.expected
@@ -3,7 +3,7 @@
   (signature void (parameters)
    ((declare (temporary) bool return_flag)
     (assign (x) (var_ref return_flag) (constant bool (0)))
-    (loop ()
+    (loop
      ((assign (x) (var_ref a) (constant float (1.000000)))
       (assign (x) (var_ref return_flag) (constant bool (1)))
       break))