glsl/tests: remove generated tests from the repo

They were made unneccesary by the last commit.

Signed-off-by: Connor Abbott <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>

49 files changed, 2 insertions, 696 deletions

diff --git a/src/glsl/tests/lower_jumps/.gitignore b/src/glsl/tests/lower_jumps/.gitignore
index f47cb2045f1..e98df627fd8 100644
--- a/src/glsl/tests/lower_jumps/.gitignore
+++ b/src/glsl/tests/lower_jumps/.gitignore
@@ -1 +1,3 @@
+*.opt_test
+*.expected
 *.out
diff --git a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
deleted file mode 100755
index e2d4ed1f343..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If a loop contains an unconditional break at the bottom of
-# it, it should not be lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 1)' <<EOF
-((declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100644
index 270a43d9058..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_1.opt_test.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-((declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100755
index f5de80339cd..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If a loop contains a conditional break at the bottom of it,
-# it should not be lowered if it is in the then-clause.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 1)' <<EOF
-((declare (in) float b) (declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) (break)
-       ())))))))
-EOF
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
deleted file mode 100644
index 73a1d56fa5f..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_2.opt_test.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-((declare (in) float b) (declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((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_3.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
deleted file mode 100755
index 60368bc1dc9..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If a loop contains a conditional break at the bottom of it,
-# it should not be lowered if it is in the then-clause, even if
-# there are statements preceding the break.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 1)' <<EOF
-((declare (in) float b) (declare (out) float a) (declare (out) float c)
- (function main
-  (signature void (parameters)
-   ((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)
-       ())))))))
-EOF
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
deleted file mode 100644
index 53d5392d05e..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_3.opt_test.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-((declare (in) float b) (declare (out) float a) (declare (out) float c)
- (function main
-  (signature void (parameters)
-   ((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_4.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
deleted file mode 100755
index cde319793ba..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If a loop contains a conditional break at the bottom of it,
-# it should not be lowered if it is in the else-clause.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 1)' <<EOF
-((declare (in) float b) (declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (if (expression bool > (var_ref b) (constant float (0.000000))) ()
-       (break))))))))
-EOF
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
deleted file mode 100644
index ecf28c4e5ab..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_4.opt_test.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-((declare (in) float b) (declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((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_5.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
deleted file mode 100755
index 157b5892ffe..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If a loop contains a conditional break at the bottom of it,
-# it should not be lowered if it is in the else-clause, even if
-# there are statements preceding the break.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 1)' <<EOF
-((declare (in) float b) (declare (out) float a) (declare (out) float c)
- (function main
-  (signature void (parameters)
-   ((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))))))))
-EOF
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
deleted file mode 100644
index 418f8798cf4..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_5.opt_test.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-((declare (in) float b) (declare (out) float a) (declare (out) float c)
- (function main
-  (signature void (parameters)
-   ((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_6.opt_test b/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
deleted file mode 100755
index 4767df13ed4..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If a loop contains conditional breaks and continues, and
-# ends in an unconditional break, then the unconditional break
-# needs to be lowered, because it will no longer be at the end
-# of the loop after the final break is added.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 1, 1)' <<EOF
-((declare (in) float a) (declare (in) float ba) (declare (in) float bb)
- (declare (in) float ca)
- (declare (in) float cb)
- (function main
-  (signature void (parameters)
-   ((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)))
-           (continue)
-           ()))
-         ())
-        (if (expression bool > (var_ref ca) (constant float (0.000000)))
-         ((if (expression bool > (var_ref cb) (constant float (0.000000)))
-           (break)
-           ()))
-         ()))
-       ())
-      break))))))
-EOF
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
deleted file mode 100644
index 5582d08b236..00000000000
--- a/src/glsl/tests/lower_jumps/lower_breaks_6.opt_test.expected
+++ /dev/null
@@ -1,29 +0,0 @@
-((declare (in) float a) (declare (in) float ba) (declare (in) float bb)
- (declare (in) float ca)
- (declare (in) float cb)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool break_flag)
-    (assign (x) (var_ref break_flag) (constant bool (0)))
-    (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)))
-           ((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)))
-             ((assign (x) (var_ref break_flag) (constant bool (1)))
-              (assign (x) (var_ref execute_flag) (constant bool (0))))
-             ()))
-           ()))
-         ()))
-       ())
-      (if (var_ref execute_flag)
-       ((assign (x) (var_ref break_flag) (constant bool (1))))
-       ())
-      (if (var_ref break_flag) (break) ())))))))
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
deleted file mode 100755
index 164914a4294..00000000000
--- a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Normally a conditional break at the end of a loop isn't
-# lowered, however if the conditional break gets placed inside
-# an if(execute_flag) because of earlier lowering of continues,
-# then the break needs to be lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 1, 1)' <<EOF
-((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
- (function main
-  (signature void (parameters)
-   ((loop
-     ((if (expression bool > (var_ref aa) (constant float (0.000000)))
-       ((if (expression bool > (var_ref ab) (constant float (0.000000)))
-         (continue)
-         ()))
-       ())
-      (if (expression bool > (var_ref b) (constant float (0.000000))) (break)
-       ())))))))
-EOF
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
deleted file mode 100644
index 037920668e9..00000000000
--- a/src/glsl/tests/lower_jumps/lower_guarded_conditional_break.opt_test.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool break_flag)
-    (assign (x) (var_ref break_flag) (constant bool (0)))
-    (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)))
-         ((assign (x) (var_ref execute_flag) (constant bool (0))))
-         ()))
-       ())
-      (if (var_ref execute_flag)
-       ((if (expression bool > (var_ref b) (constant float (0.000000)))
-         ((assign (x) (var_ref break_flag) (constant bool (1)))
-          (assign (x) (var_ref execute_flag) (constant bool (0))))
-         ()))
-       ())
-      (if (var_ref break_flag) (break) ())))))))
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
deleted file mode 100755
index 1a5c09690bf..00000000000
--- a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If one branch of an if ends in a jump, and control cannot
-# fall out the bottom of the other branch, and pull_out_jumps is
-# True, then the jump is lifted outside the if.
-# Verify that this lowering occurs during the same pass as the
-# lowering of other jumps by checking that extra temporary
-# variables aren't generated.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(1, 0, 1, 0, 0)' <<EOF
-((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
- (declare (in) float c)
- (declare (out) float d)
- (function main
-  (signature void (parameters)
-   ((if (expression bool > (var_ref aa) (constant float (0.000000)))
-     ((if (expression bool > (var_ref ab) (constant float (0.000000)))
-       ((return))
-       ()))
-     ())
-    (loop
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
-       ((if (expression bool > (var_ref c) (constant float (0.000000))) (break)
-         (continue)))
-       ((return)))))
-    (assign (x) (var_ref d) (constant float (1.000000)))))))
-EOF
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
deleted file mode 100644
index 47e8c795c45..00000000000
--- a/src/glsl/tests/lower_jumps/lower_pulled_out_jump.opt_test.expected
+++ /dev/null
@@ -1,25 +0,0 @@
-((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
- (declare (in) float c)
- (declare (out) float d)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool execute_flag)
-    (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)))
-       ((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))) ()
-           (continue)))
-         ((assign (x) (var_ref return_flag) (constant bool (1)))))
-        break))
-      (if (var_ref return_flag) ()
-       ((assign (x) (var_ref d) (constant float (1.000000))))))
-     ())))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_1.opt_test b/src/glsl/tests/lower_jumps/lower_returns_1.opt_test
deleted file mode 100755
index e73c51208ad..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_1.opt_test
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a void return at the end of a function is
-# eliminated.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 1, 0, 0)' <<EOF
-((declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((assign (x) (var_ref a) (constant float (1.000000))) (return)))))
-EOF
diff --git a/src/glsl/tests/lower_jumps/lower_returns_1.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_1.opt_test.expected
deleted file mode 100644
index 7c3919c016e..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_1.opt_test.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-((declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((assign (x) (var_ref a) (constant float (1.000000)))))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_2.opt_test b/src/glsl/tests/lower_jumps/lower_returns_2.opt_test
deleted file mode 100755
index da2dc7ee299..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_2.opt_test
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that lowering is not performed on a non-void return at
-# the end of subroutine.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 1, 0, 0, 0)' <<EOF
-((declare (out) float a)
- (function sub
-  (signature float (parameters)
-   ((assign (x) (var_ref a) (constant float (1.000000)))
-    (return (constant float (1.000000)))))))
-EOF
diff --git a/src/glsl/tests/lower_jumps/lower_returns_2.opt_test.expected b/src/glsl/tests/lower_jumps/lower_returns_2.opt_test.expected
deleted file mode 100644
index 7777927f5a3..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_2.opt_test.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-((declare (out) float a)
- (function sub
-  (signature float (parameters)
-   ((assign (x) (var_ref a) (constant float (1.000000)))
-    (return (constant float (1.000000)))))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test b/src/glsl/tests/lower_jumps/lower_returns_3.opt_test
deleted file mode 100755
index 9509781fe85..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test lowering of returns when there is one nested inside a
-# complex structure of ifs, and one at the end of a function.
-# In this case, the latter return needs to be lowered because it
-# will not be at the end of the function once the final return
-# is inserted.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 1, 0, 0, 0)' <<EOF
-((declare (in) float a) (declare (in) float b)
- (function sub
-  (signature float (parameters)
-   ((if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((if (expression bool > (var_ref b) (constant float (0.000000)))
-       ((return (constant float (1.000000))))
-       ()))
-     ())
-    (return (constant float (2.000000)))))))
-EOF
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
deleted file mode 100644
index d4835e96b7c..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_3.opt_test.expected
+++ /dev/null
@@ -1,21 +0,0 @@
-((declare (in) float a) (declare (in) float b)
- (function sub
-  (signature float (parameters)
-   ((declare (temporary) bool execute_flag)
-    (assign (x) (var_ref execute_flag) (constant bool (1)))
-    (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)))
-       ((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))))
-       ()))
-     ())
-    (if (var_ref execute_flag)
-     ((assign (x) (var_ref return_value) (constant float (2.000000)))
-      (assign (x) (var_ref return_flag) (constant bool (1)))
-      (assign (x) (var_ref execute_flag) (constant bool (0))))
-     ())
-    (return (var_ref return_value))))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test b/src/glsl/tests/lower_jumps/lower_returns_4.opt_test
deleted file mode 100755
index c5bb9c89847..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that returns are properly lowered when they occur in
-# both branches of an if-statement.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 1, 0, 0, 0)' <<EOF
-((declare (in) float a)
- (function sub
-  (signature float (parameters)
-   ((if (expression bool > (var_ref a) (constant float (0.000000)))
-     ((return (constant float (1.000000))))
-     ((return (constant float (2.000000)))))))))
-EOF
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
deleted file mode 100644
index b551a066f43..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_4.opt_test.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-((declare (in) float a)
- (function sub
-  (signature float (parameters)
-   ((declare (temporary) bool execute_flag)
-    (assign (x) (var_ref execute_flag) (constant bool (1)))
-    (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)))
-     ((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))))
-     ((assign (x) (var_ref return_value) (constant float (2.000000)))
-      (assign (x) (var_ref return_flag) (constant bool (1)))
-      (assign (x) (var_ref execute_flag) (constant bool (0)))))
-    (return (var_ref return_value))))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test b/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test
deleted file mode 100755
index fdb1d0ed28b..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that do_lower_jumps respects the lower_main_return
-# flag in deciding whether to lower returns in the main
-# function.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 0)' <<EOF
-((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)))
-       ((return))
-       ()))
-     ())))))
-EOF
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
deleted file mode 100644
index e8b36f14478..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_main_false.opt_test.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-((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)))
-       ((return))
-       ()))
-     ())))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test b/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test
deleted file mode 100755
index 939ec8b0e4e..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that do_lower_jumps respects the lower_main_return
-# flag in deciding whether to lower returns in the main
-# function.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 1, 0, 0)' <<EOF
-((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)))
-       ((return))
-       ()))
-     ())))))
-EOF
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
deleted file mode 100644
index e15a97d1db2..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_main_true.opt_test.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-((declare (in) float a) (declare (in) float b)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool execute_flag)
-    (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)))
-       ((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 b/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test
deleted file mode 100755
index 92a4e8a6297..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that do_lower_jumps respects the lower_sub_return flag
-# in deciding whether to lower returns in subroutines.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 0)' <<EOF
-((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)))
-       ((return))
-       ()))
-     ())))))
-EOF
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
deleted file mode 100644
index 07db6e708f4..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_false.opt_test.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-((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)))
-       ((return))
-       ()))
-     ())))))
diff --git a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test b/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test
deleted file mode 100755
index 789414ecbc7..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that do_lower_jumps respects the lower_sub_return flag
-# in deciding whether to lower returns in subroutines.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 1, 0, 0, 0)' <<EOF
-((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)))
-       ((return))
-       ()))
-     ())))))
-EOF
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
deleted file mode 100644
index 31109802351..00000000000
--- a/src/glsl/tests/lower_jumps/lower_returns_sub_true.opt_test.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-((declare (in) float a) (declare (in) float b)
- (function sub
-  (signature void (parameters)
-   ((declare (temporary) bool execute_flag)
-    (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)))
-       ((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 b/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test
deleted file mode 100755
index 5d6e51cff9b..00000000000
--- a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# If both branches of an if statement end in a return, and
-# pull_out_jumps is True, then those returns should be lifted
-# outside the if and then properly lowered.
-# Verify that this lowering occurs during the same pass as the
-# lowering of other returns by checking that extra temporary
-# variables aren't generated.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(1, 0, 1, 0, 0)' <<EOF
-((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
- (declare (in) float c)
- (function main
-  (signature void (parameters)
-   ((if (expression bool > (var_ref aa) (constant float (0.000000)))
-     ((if (expression bool > (var_ref ab) (constant float (0.000000)))
-       ((return))
-       ()))
-     ())
-    (if (expression bool > (var_ref b) (constant float (0.000000)))
-     ((if (expression bool > (var_ref c) (constant float (0.000000)))
-       ((return))
-       ((return))))
-     ())))))
-EOF
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
deleted file mode 100644
index 271cd3b462e..00000000000
--- a/src/glsl/tests/lower_jumps/lower_unified_returns.opt_test.expected
+++ /dev/null
@@ -1,21 +0,0 @@
-((declare (in) float aa) (declare (in) float ab) (declare (in) float b)
- (declare (in) float c)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool execute_flag)
-    (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)))
-       ((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))) () ())
-        (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/remove_continue_at_end_of_loop.opt_test b/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
deleted file mode 100755
index 5fa1134f985..00000000000
--- a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a redundant continue-statement at the end of a
-# loop is removed.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 0)' <<EOF
-((declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100644
index 2a7ec2ecbec..00000000000
--- a/src/glsl/tests/lower_jumps/remove_continue_at_end_of_loop.opt_test.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-((declare (out) float a)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100755
index 1f62e73498d..00000000000
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a non-void return at the end of a loop is
-# properly lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 0)' <<EOF
-((declare (out) float a) (declare (out) float b)
- (function sub
-  (signature float (parameters)
-   ((loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (return (constant float (2.000000)))))
-    (assign (x) (var_ref b) (constant float (3.000000)))
-    (return (constant float (4.000000)))))))
-EOF
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
deleted file mode 100644
index 040d383b604..00000000000
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_nothing.opt_test.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-((declare (out) float a) (declare (out) float b)
- (function sub
-  (signature float (parameters)
-   ((loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (return (constant float (2.000000)))))
-    (assign (x) (var_ref b) (constant float (3.000000)))
-    (return (constant float (4.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
deleted file mode 100755
index 42c4e7529b3..00000000000
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a non-void return at the end of a loop is
-# properly lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 1, 0, 0, 0)' <<EOF
-((declare (out) float a) (declare (out) float b)
- (function sub
-  (signature float (parameters)
-   ((loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (return (constant float (2.000000)))))
-    (assign (x) (var_ref b) (constant float (3.000000)))
-    (return (constant float (4.000000)))))))
-EOF
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
deleted file mode 100644
index 792cbf69a99..00000000000
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return.opt_test.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-((declare (out) float a) (declare (out) float b)
- (function sub
-  (signature float (parameters)
-   ((declare (temporary) bool execute_flag)
-    (assign (x) (var_ref execute_flag) (constant bool (1)))
-    (declare (temporary) float return_value)
-    (declare (temporary) bool return_flag)
-    (assign (x) (var_ref return_flag) (constant bool (0)))
-    (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)))
-      break))
-    (if (var_ref return_flag) ()
-     ((assign (x) (var_ref b) (constant float (3.000000)))
-      (assign (x) (var_ref return_value) (constant float (4.000000)))
-      (assign (x) (var_ref return_flag) (constant bool (1)))
-      (assign (x) (var_ref execute_flag) (constant bool (0)))))
-    (return (var_ref return_value))))))
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
deleted file mode 100755
index b3eef39b7e2..00000000000
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a non-void return at the end of a loop is
-# properly lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 1, 0, 0, 1)' <<EOF
-((declare (out) float a) (declare (out) float b)
- (function sub
-  (signature float (parameters)
-   ((loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (return (constant float (2.000000)))))
-    (assign (x) (var_ref b) (constant float (3.000000)))
-    (return (constant float (4.000000)))))))
-EOF
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
deleted file mode 100644
index 792cbf69a99..00000000000
--- a/src/glsl/tests/lower_jumps/return_non_void_at_end_of_loop_lower_return_and_break.opt_test.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-((declare (out) float a) (declare (out) float b)
- (function sub
-  (signature float (parameters)
-   ((declare (temporary) bool execute_flag)
-    (assign (x) (var_ref execute_flag) (constant bool (1)))
-    (declare (temporary) float return_value)
-    (declare (temporary) bool return_flag)
-    (assign (x) (var_ref return_flag) (constant bool (0)))
-    (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)))
-      break))
-    (if (var_ref return_flag) ()
-     ((assign (x) (var_ref b) (constant float (3.000000)))
-      (assign (x) (var_ref return_value) (constant float (4.000000)))
-      (assign (x) (var_ref return_flag) (constant bool (1)))
-      (assign (x) (var_ref execute_flag) (constant bool (0)))))
-    (return (var_ref return_value))))))
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
deleted file mode 100755
index 79442433c08..00000000000
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a return of void at the end of a loop is properly
-# lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 0, 0, 0)' <<EOF
-((declare (out) float a) (declare (out) float b)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100644
index 156e95edf7d..00000000000
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_nothing.opt_test.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-((declare (out) float a) (declare (out) float b)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100755
index 76469f73d6a..00000000000
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a return of void at the end of a loop is properly
-# lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 1, 0, 0)' <<EOF
-((declare (out) float a) (declare (out) float b)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100644
index 66f3aeca594..00000000000
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return.opt_test.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-((declare (out) float a) (declare (out) float b)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool return_flag)
-    (assign (x) (var_ref return_flag) (constant bool (0)))
-    (loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (assign (x) (var_ref return_flag) (constant bool (1)))
-      break))
-    (if (var_ref return_flag) ()
-     ((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_and_break.opt_test b/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
deleted file mode 100755
index 1d145b4fcb7..00000000000
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# This file was generated by create_test_cases.py.
-#
-# Test that a return of void at the end of a loop is properly
-# lowered.
-../../glsl_test optpass --quiet --input-ir 'do_lower_jumps(0, 0, 1, 0, 1)' <<EOF
-((declare (out) float a) (declare (out) float b)
- (function main
-  (signature void (parameters)
-   ((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
deleted file mode 100644
index 66f3aeca594..00000000000
--- a/src/glsl/tests/lower_jumps/return_void_at_end_of_loop_lower_return_and_break.opt_test.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-((declare (out) float a) (declare (out) float b)
- (function main
-  (signature void (parameters)
-   ((declare (temporary) bool return_flag)
-    (assign (x) (var_ref return_flag) (constant bool (0)))
-    (loop
-     ((assign (x) (var_ref a) (constant float (1.000000)))
-      (assign (x) (var_ref return_flag) (constant bool (1)))
-      break))
-    (if (var_ref return_flag) ()
-     ((assign (x) (var_ref b) (constant float (2.000000)))))))))