This is an archive of the discontinued LLVM Phabricator instance.

Differential D152896

[update_mir_test_checks] Tolerate -simplify-mir output
ClosedPublic

Authored by foad on Jun 14 2023, 3:49 AM.

Details

Reviewers
gbossu
arichardson
bogner
nhaehnle
arsenm
Commits
rGe829eb9075c4: [update_mir_test_checks] Tolerate -simplify-mir output
Summary

D135579 added support for fixedStack, but did not cope with the output
of -simplify-mir which does not include the fixedStack section by
default.

Diff Detail

Event Timeline

foad created this revision.Jun 14 2023, 3:49 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 14 2023, 3:49 AM
Herald added a subscriber: StephenFan. · View Herald Transcript
foad requested review of this revision.Jun 14 2023, 3:49 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 14 2023, 3:49 AM
Herald added subscribers: llvm-commits, wdng. · View Herald Transcript
foad mentioned this in D135579: utils/update_mir_test_checks.py: allow checking fixedStack in .mir files.Jun 14 2023, 3:50 AM
Harbormaster completed remote builds in B238744: Diff 531252.Jun 14 2023, 4:24 AM
arsenm accepted this revision.Jun 14 2023, 4:39 AM
This revision is now accepted and ready to land.Jun 14 2023, 4:39 AM
This revision was landed with ongoing or failed builds.Jun 14 2023, 5:16 AM
Closed by commit rGe829eb9075c4: [update_mir_test_checks] Tolerate -simplify-mir output (authored by foad). · Explain Why
This revision was automatically updated to reflect the committed changes.
foad added a commit: rGe829eb9075c4: [update_mir_test_checks] Tolerate -simplify-mir output.

Revision Contents

PathSize
llvm/
test/
tools/
UpdateTestChecks/
update_mir_test_checks/
Inputs/
5 lines
9 lines
5 lines
utils/
4 lines

Diff 531272

llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-simplify-mir.ll

  • This file was added.
; RUN: llc < %s -mtriple=x86_64 -stop-after=finalize-isel -simplify-mir | FileCheck %s
define void @f() {
ret void
}

llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-simplify-mir.ll.expected

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
; RUN: llc < %s -mtriple=x86_64 -stop-after=finalize-isel -simplify-mir | FileCheck %s
define void @f() {
; CHECK-LABEL: name: f
; CHECK: bb.0 (%ir-block.0):
; CHECK-NEXT: RET 0
ret void
}

llvm/test/tools/UpdateTestChecks/update_mir_test_checks/x86-simplify-mir.test

  • This file was added.
# REQUIRES: x86-registered-target
## Check that update_mir_test_checks handles -simplify-mir
# RUN: cp -f %S/Inputs/x86-simplify-mir.ll %t.ll && %update_mir_test_checks %t.ll
# RUN: diff -u %S/Inputs/x86-simplify-mir.ll.expected %t.ll

llvm/utils/update_mir_test_checks.py

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines
) )
IR_PREFIX_DATA_RE = re.compile(r"^ *(;|$)") IR_PREFIX_DATA_RE = re.compile(r"^ *(;|$)")
MIR_FUNC_RE = re.compile( MIR_FUNC_RE = re.compile(
r"^---$" r"^---$"
r"\n" r"\n"
r"^ *name: *(?P<func>[A-Za-z0-9_.-]+)$" r"^ *name: *(?P<func>[A-Za-z0-9_.-]+)$"
r".*?" r".*?"
r"^ *fixedStack: *(\[\])? *\n" r"(?:^ *fixedStack: *(\[\])? *\n"
r"(?P<fixedStack>.*?)\n?" r"(?P<fixedStack>.*?)\n?"
r"^ *stack:" r"^ *stack:"
r".*?" r".*?)?"
r"^ *body: *\|\n" r"^ *body: *\|\n"
r"(?P<body>.*?)\n" r"(?P<body>.*?)\n"
r"^\.\.\.$", r"^\.\.\.$",
flags=(re.M | re.S), flags=(re.M | re.S),
) )
class LLC: class LLC:
▲ Show 20 Lines • Show All 432 Lines • Show Last 20 Lines