This is an archive of the discontinued LLVM Phabricator instance.

[SCEV] Fix ScalarEvolution tests under NPM
ClosedPublic

Authored by aeubanks on Jul 14 2020, 11:22 AM.

Details

Summary

Many tests use opt's -analyze feature, which does not translate well to
NPM and has better alternatives. The alternative here is to explicitly
add a pass that calls ScalarEvolution::print().

The legacy pass manager RUNs aren't changing, but they are now pinned to
the legacy pass manager. For each legacy pass manager RUN, I added a
corresponding NPM RUN using the 'print<scalar-evolution>' pass. For
compatibility with update_analyze_test_checks.py and existing test
CHECKs, 'print<scalar-evolution>' now prints what -analyze prints per
function.

This was generated by the following Python script and failures were
manually fixed up:

import sys
for i in sys.argv:

with open(i, 'r') as f:
    s = f.read()
with open(i, 'w') as f:
    for l in s.splitlines():
        if "RUN:" in l and ' -analyze ' in l and '\\' not in l:
            f.write(l.replace(' -analyze ', ' -analyze -enable-new-pm=0 '))
            f.write('\n')
            f.write(l.replace(' -analyze ', ' -disable-output ').replace(' -scalar-evolution ', ' "-passes=print<scalar-evolution>" ').replace(" | ", " 2>&1 | "))
            f.write('\n')
        else:
            f.write(l)

There are a couple failures still in ScalarEvolution under NPM, but
those are due to other unrelated naming conflicts.

Diff Detail

Event Timeline

aeubanks created this revision.Jul 14 2020, 11:22 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 14 2020, 11:22 AM
ychen added a comment.Jul 15 2020, 9:54 AM

LGTM. Please let one more reviewer double-check.

aeubanks updated this revision to Diff 278251.Jul 15 2020, 11:06 AM

Fix tests broken after rebase

asbirlea accepted this revision.Jul 15 2020, 10:22 PM

Thank you!

This revision is now accepted and ready to land.Jul 15 2020, 10:22 PM
This revision was automatically updated to reflect the committed changes.