Peter Trommler pushed to branch wip/T26519 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • testsuite/tests/profiling/should_run/all.T
    ... ... @@ -80,8 +80,7 @@ test('T3001-2',
    80 80
     # For profasm/profthreaded, the answer is correct but the ordering of some
    
    81 81
     # lines in the output happen to be different, so we just skip them.
    
    82 82
     test('scc001',
    
    83
    -     [grep_prof("scc001.hs"), omit_ways(['profasm', 'profthreaded'])
    
    84
    -     , expect_broken_for(25959, ['prof', 'profdyn'])],
    
    83
    +     [grep_prof("scc001.hs"), omit_ways(['profasm', 'profthreaded'])],
    
    85 84
          compile_and_run,
    
    86 85
          ['-fno-state-hack -fno-full-laziness']) # Note [consistent stacks]
    
    87 86
     
    
    ... ... @@ -132,7 +131,7 @@ test('prof-doc-last', [grep_prof("prof-doc-last.hs"), test_opts_dot_prof], compi
    132 131
     # unicode in cost centre names
    
    133 132
     test('T5559', [test_opts_dot_prof, fragile(16350), grep_prof("T5559.hs")], compile_and_run, [''])
    
    134 133
     
    
    135
    -test('T7275', [test_opts_dot_prof, expect_broken_for(25959,['prof', 'profdyn'])], makefile_test, [])
    
    134
    +test('T7275', test_opts_dot_prof, makefile_test, [])
    
    136 135
     
    
    137 136
     # Note [consistent stacks]
    
    138 137
     # ~~~~~~~~~~~~~~~~~~~~~~~~
    
    ... ... @@ -146,14 +145,12 @@ test('T7275', [test_opts_dot_prof, expect_broken_for(25959,['prof', 'profdyn'])]
    146 145
     test('callstack001',
    
    147 146
          # unoptimised results are different w.r.t. CAF attribution
    
    148 147
          [test_opts_dot_prof # produces a different stack
    
    149
    -     , expect_broken_for(25959,['prof', 'profdyn'])
    
    150
    -     , normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s).replace("//","/"))
    
    148
    +     ,normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s).replace("//","/"))
    
    151 149
          ], compile_and_run,
    
    152 150
          ['-fprof-auto-calls -fno-full-laziness -fno-state-hack'])
    
    153 151
     
    
    154 152
     test('callstack002',
    
    155 153
          [ test_opts_dot_prof # produces a different stack
    
    156
    -     , expect_broken_for(25959,['prof', 'profdyn'])
    
    157 154
          , normalise_fun(lambda s: re.sub(r"(?<!('|‘))\\", '/', s))
    
    158 155
          ],
    
    159 156
          compile_and_run,
    
    ... ... @@ -185,12 +182,9 @@ test('T11978a',
    185 182
          compile_and_run, [''])
    
    186 183
     
    
    187 184
     test('toplevel_scc_1',
    
    188
    -     [grep_prof("toplevel_scc_1.hs"), extra_ways(['prof_no_auto'])
    
    189
    -     , only_ways(['prof_no_auto'])
    
    190
    -     , expect_broken_for(25959, 'prof_no_auto')
    
    191
    -     ]
    
    192
    -     , compile_and_run
    
    193
    -     , [''])
    
    185
    +     [grep_prof("toplevel_scc_1.hs"), extra_ways(['prof_no_auto']), only_ways(['prof_no_auto'])],
    
    186
    +     compile_and_run,
    
    187
    +     [''])
    
    194 188
     
    
    195 189
     test('T12962', [test_opts_dot_prof, grep_prof("T12962.hs")], compile_and_run, [''])
    
    196 190
     
    

  • testsuite/tests/profiling/should_run/caller-cc/all.T
    ... ... @@ -12,7 +12,7 @@ setTestOpts(grep_prof("calling:"))
    12 12
     
    
    13 13
     # N.B. Main.hs is stolen from heapprof001.
    
    14 14
     
    
    15
    -test('CallerCc1', expect_broken_for(25959,['prof', 'profasm']),
    
    15
    +test('CallerCc1', normal,
    
    16 16
          multimod_compile_and_run,
    
    17 17
          ['Main', '-fprof-callers=*.concat -O0'])
    
    18 18