From 7bc7f2da763ba7694bbdda3178d5638348a1bc11 Mon Sep 17 00:00:00 2001 From: Anton Sidorenko Date: Tue, 18 Oct 2022 16:35:19 +0300 Subject: [PATCH] [UpdateTestChecks] Sync flags in update_mir_test_checks.py with MIFlags Some instructions are not matched by update_mir_test_checks.py because MIFlags and regex in the script are not synchronized. Differential Revision: https://reviews.llvm.org/D136170 --- .../update_mir_test_checks/Inputs/x86-MIFlags.mir.expected | 4 ++-- llvm/utils/update_mir_test_checks.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-MIFlags.mir.expected b/llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-MIFlags.mir.expected index 60ce43b..39560a1 100644 --- a/llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-MIFlags.mir.expected +++ b/llvm/test/tools/UpdateTestChecks/update_mir_test_checks/Inputs/x86-MIFlags.mir.expected @@ -73,8 +73,8 @@ body: | ; CHECK-NEXT: {{ $}} ; CHECK-NEXT: [[COPY:%[0-9]+]]:fr32 = COPY $xmm0 ; CHECK-NEXT: [[MOVSSrm_alt:%[0-9]+]]:fr32 = MOVSSrm_alt $rip, 1, $noreg, %const.0, $noreg :: (load (s32) from constant-pool) - ; CHECK-NEXT: %2:fr32 = nsz nofpexcept DIVSSrr [[MOVSSrm_alt]], [[COPY]], implicit $mxcsr - ; CHECK-NEXT: $xmm0 = COPY %2 + ; CHECK-NEXT: [[DIVSSrr:%[0-9]+]]:fr32 = nsz nofpexcept DIVSSrr [[MOVSSrm_alt]], [[COPY]], implicit $mxcsr + ; CHECK-NEXT: $xmm0 = COPY [[DIVSSrr]] ; CHECK-NEXT: RET 0, $xmm0 %0:fr32 = COPY $xmm0 %1:fr32 = MOVSSrm_alt $rip, 1, $noreg, %const.0, $noreg :: (load (s32) from constant-pool) diff --git a/llvm/utils/update_mir_test_checks.py b/llvm/utils/update_mir_test_checks.py index adf8e49..70bc736 100755 --- a/llvm/utils/update_mir_test_checks.py +++ b/llvm/utils/update_mir_test_checks.py @@ -35,7 +35,7 @@ MIR_BASIC_BLOCK_RE = re.compile(r' *bb\.[0-9]+.*:$') VREG_RE = re.compile(r'(%[0-9]+)(?::[a-z0-9_]+)?(?:\([<>a-z0-9 ]+\))?') MI_FLAGS_STR= ( r'(frame-setup |frame-destroy |nnan |ninf |nsz |arcp |contract |afn ' - r'|reassoc |nuw |nsw |exact |fpexcept )*') + r'|reassoc |nuw |nsw |exact |nofpexcept |nomerge )*') VREG_DEF_RE = re.compile( r'^ *(?P{0}(?:, {0})*) = ' r'{1}(?P[A-Zt][A-Za-z0-9_]+)'.format(VREG_RE.pattern, MI_FLAGS_STR)) -- 2.7.4