diff options
| -rw-r--r-- | testsuite/tests/numeric/should_compile/Makefile | 6 | ||||
| -rw-r--r-- | testsuite/tests/simplCore/should_compile/Makefile | 16 | ||||
| -rw-r--r-- | testsuite/tests/simplCore/should_compile/all.T | 30 |
3 files changed, 26 insertions, 26 deletions
diff --git a/testsuite/tests/numeric/should_compile/Makefile b/testsuite/tests/numeric/should_compile/Makefile index 522e703b50..9c7aa350f8 100644 --- a/testsuite/tests/numeric/should_compile/Makefile +++ b/testsuite/tests/numeric/should_compile/Makefile @@ -4,12 +4,12 @@ include $(TOP)/mk/test.mk T7116: $(RM) -f T7116.o T7116.hi - '$(TEST_HC)' $(TEST_HC_OPTS) -O2 -c -ddump-simpl -dsuppress-uniques T7116.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O2 -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks T7116.hs T14170: $(RM) -f T14170.o T14170.hi - '$(TEST_HC)' $(TEST_HC_OPTS) -O2 -c -ddump-simpl -dsuppress-uniques T14170.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O2 -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks T14170.hs T14465: $(RM) -f T14465.o T14465.hi - '$(TEST_HC)' $(TEST_HC_OPTS) -O2 -c -ddump-simpl -dsuppress-uniques T14465.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O2 -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks T14465.hs diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile index 8577dea2a7..e9f00a526f 100644 --- a/testsuite/tests/simplCore/should_compile/Makefile +++ b/testsuite/tests/simplCore/should_compile/Makefile @@ -40,16 +40,16 @@ T13317: T13367: $(RM) -f T13317.o T13317.hi - '$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl T13367.hs | grep 'foo' + '$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl -dsuppress-ticks T13367.hs | grep 'foo' # There should be only one copy of the string "foo"# T8832: $(RM) -f T8832.o T8832.hi - '$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl T8832.hs | grep '^[a-zA-Z0-9]\+ =' + '$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | grep '^[a-zA-Z0-9]\+ =' T12603: $(RM) -f T12603.o T12603.hi - '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques T12603.hs | grep 'GHC.Real' + '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks T12603.hs | grep 'GHC.Real' # Horribly delicate; looking for a top-level shared call to 2^8 T11155: @@ -61,11 +61,11 @@ T11155: T8274: $(RM) -f T8274.o T8274.hi # Set -dppr-cols to ensure things don't wrap - '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques -dppr-cols=200 T8274.hs | grep '#' + '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks -dppr-cols=200 T8274.hs | grep '#' T7865: $(RM) -f T7865.o T7865.hi - '$(TEST_HC)' $(TEST_HC_OPTS) -dsuppress-uniques -O2 -c -ddump-simpl T7865.hs | grep expensive + '$(TEST_HC)' $(TEST_HC_OPTS) -dsuppress-uniques -dsuppress-ticks -O2 -c -ddump-simpl T7865.hs | grep expensive T3055: $(RM) -f T3055.o T3055.hi T3055.simpl @@ -85,7 +85,7 @@ T5776: T3772: $(RM) -f T3772*.hi T3772*.o '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772_A.hs - '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772.hs -dsuppress-uniques -ddump-simpl + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772.hs -dsuppress-uniques -dsuppress-ticks -ddump-simpl T4306: $(RM) -f T4306.hi T4306.o @@ -225,7 +225,7 @@ T13025: .PHONY: str-rules str-rules: $(RM) -f str-rules.hi str-rules.o - '$(TEST_HC)' $(TEST_HC_OPTS) -c -O str-rules.hs -ddump-simpl | grep -o '"@@@[^"].*"#' | sort + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O str-rules.hs -ddump-simpl -dsuppress-ticks | grep -o '"@@@[^"].*"#' | sort # We expect there to be precisely one use of +# in the simplified Core as f and # g should have been collapsed into one defininition by CSE. @@ -254,5 +254,5 @@ T14140: T15631: $(RM) -f T15631.o T15631.hi - '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques T15631.hs | grep 'case' + '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks T15631.hs | grep 'case' # Expecting one fewwer case expressions after fixing Trac #15631 diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T index 1bb4694645..b5cd8b4399 100644 --- a/testsuite/tests/simplCore/should_compile/all.T +++ b/testsuite/tests/simplCore/should_compile/all.T @@ -15,7 +15,7 @@ test('simpl011', normal, compile, ['']) test('simpl012', normal, compile, ['']) test('simpl013', normal, compile, ['']) test('simpl014', normal, compile, ['']) -test('simpl016', normal, compile, ['-dsuppress-uniques']) +test('simpl016', normal, compile, ['-dsuppress-uniques -dsuppress-ticks']) test('simpl017', normal, compile_fail, ['']) test('simpl018', normal, compile, ['']) test('simpl019', normal, compile, ['']) @@ -29,7 +29,7 @@ test('spec002', normal, compile, ['']) test('spec003', normal, compile, ['']) test('rule1', normal, compile, ['']) -test('rule2', only_ways(['optasm']), compile, ['-dsuppress-uniques']) +test('rule2', only_ways(['optasm']), compile, ['-dsuppress-uniques -dsuppress-ticks']) test('T7162', normal, compile, ['']) test('dfun-loop', normal, compile, ['']) @@ -49,18 +49,18 @@ test('T3234', test('T3717', only_ways(['optasm']), compile, - ['-ddump-simpl -dsuppress-uniques']) + ['-ddump-simpl -dsuppress-uniques -dsuppress-ticks']) test('spec-inline', only_ways(['optasm']), compile, - ['-O2 -ddump-simpl -dsuppress-uniques']) + ['-O2 -ddump-simpl -dsuppress-uniques -dsuppress-ticks']) test('T4908', only_ways(['optasm']), compile, - ['-O2 -ddump-simpl -dsuppress-uniques']) + ['-O2 -ddump-simpl -dsuppress-uniques -dsuppress-ticks']) test('T4930', only_ways(['optasm']), compile, - ['-O -ddump-simpl -dsuppress-uniques']) + ['-O -ddump-simpl -dsuppress-uniques -dsuppress-ticks']) test('T3055', [], makefile_test, ['T3055']) @@ -83,7 +83,7 @@ test('EvalTest', test('T3831', normal, compile, ['']) test('T4345', normal, compile, ['']) -test('T4398', normal, compile, ['-dsuppress-uniques']) +test('T4398', normal, compile, ['-dsuppress-uniques -dsuppress-ticks']) test('T4903', [], makefile_test, ['T4903']) @@ -128,7 +128,7 @@ test('T7088', normal, compile, ['']) test('T6082-RULE', normal, compile, ['']) test('T7165', [], makefile_test, ['T7165']) test('T7287', normal, compile, ['']) -test('T7360', only_ways(['optasm']), compile, ['-ddump-simpl -dsuppress-uniques']) +test('T7360', only_ways(['optasm']), compile, ['-ddump-simpl -dsuppress-uniques -dsuppress-ticks']) test('T5366', normal, makefile_test, ['T5366']) @@ -182,8 +182,8 @@ test('T8848', normal, test('T8848a', only_ways(['optasm']), compile, ['-ddump-rules']) test('T8331', only_ways(['optasm']), compile, ['-ddump-rules']) test('T6056', only_ways(['optasm']), multimod_compile, ['T6056', '-v0 -ddump-rule-firings']) -test('T9400', only_ways(['optasm']), compile, ['-O0 -ddump-simpl -dsuppress-uniques']) -test('T9441a', [only_ways(['optasm']), check_errmsg(r'f1 = f2') ], compile, ['-ddump-simpl']) +test('T9400', only_ways(['optasm']), compile, ['-O0 -ddump-simpl -dsuppress-uniques -dsuppress-ticks']) +test('T9441a', [only_ways(['optasm']), check_errmsg(r'f1 = f2') ], compile, ['-ddump-simpl -dsuppress-ticks']) test('T9441b', [only_ways(['optasm']), check_errmsg(r'Rec {') ], compile, ['-ddump-simpl']) test('T9441c', [only_ways(['optasm']), check_errmsg(r'Rec {') ], compile, ['-ddump-simpl']) test('T9583', only_ways(['optasm']), compile, ['']) @@ -214,8 +214,8 @@ test('T12076lit', normal, compile, ['-O']) test('T12076sat', normal, compile, ['-O']) test('T12212', normal, compile, ['-O']) -test('noinline01', only_ways(['optasm']), compile, ['-ddump-stg -dsuppress-uniques -O']) -test('par01', only_ways(['optasm']), compile, ['-ddump-prep -dsuppress-uniques -O2']) +test('noinline01', only_ways(['optasm']), compile, ['-ddump-stg -dsuppress-uniques -dsuppress-ticks -O']) +test('par01', only_ways(['optasm']), compile, ['-ddump-prep -dsuppress-uniques -dsuppress-ticks -O2']) test('T12776', normal, compile, ['-O2']) test('T9509', normal, @@ -228,7 +228,7 @@ test('T13027', normal, compile, ['']) test('T13025', normal, makefile_test, ['T13025']) -test('T13143', only_ways(['optasm']), compile, ['-O -ddump-simpl -dsuppress-uniques']) +test('T13143', only_ways(['optasm']), compile, ['-O -ddump-simpl -dsuppress-uniques -dsuppress-ticks']) test('T13156', normal, makefile_test, ['T13156']) test('T11444', normal, compile, ['']) test('str-rules', @@ -267,9 +267,9 @@ test('T13708', normal, compile, ['']) # thunk should inline here, so check whether or not it appears in the Core # (we skip profasm because it might not inline there) -test('T14137', [ check_errmsg(r'thunk'), omit_ways(['profasm']) ], compile, ['-dsuppress-uniques -ddump-simpl']) +test('T14137', [ check_errmsg(r'thunk'), omit_ways(['profasm']) ], compile, ['-dsuppress-uniques -dsuppress-ticks -ddump-simpl']) # bar and foo should CSEd here, so check for that in the Core -test('T14186', [ only_ways(['optasm']), check_errmsg(r'bar = foo') ], compile, ['-ddump-simpl']) +test('T14186', [ only_ways(['optasm']), check_errmsg(r'bar = foo') ], compile, ['-ddump-simpl -dsuppress-ticks']) test('T14140', normal, |