diff options
| -rw-r--r-- | llvm/utils/UpdateTestChecks/asm.py | 5 | ||||
| -rwxr-xr-x | llvm/utils/update_llc_test_checks.py | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py index 24090fc..476e7f1 100644 --- a/llvm/utils/UpdateTestChecks/asm.py +++ b/llvm/utils/UpdateTestChecks/asm.py @@ -177,8 +177,9 @@ def scrub_asm_x86(asm, args): # Detect stack spills and reloads and hide their exact offset and whether # they used the stack pointer or frame pointer. asm = SCRUB_X86_SPILL_RELOAD_RE.sub(r'{{[-0-9]+}}(%\1{{[sb]}}p)\2', asm) - # Generically match the stack offset of a memory operand. - asm = SCRUB_X86_SP_RE.sub(r'{{[0-9]+}}(%\1)', asm) + if getattr(args, 'x86_scrub_sp', True): + # Generically match the stack offset of a memory operand. + asm = SCRUB_X86_SP_RE.sub(r'{{[0-9]+}}(%\1)', asm) if getattr(args, 'x86_scrub_rip', False): # Generically match a RIP-relative memory operand. asm = SCRUB_X86_RIP_RE.sub(r'{{.*}}(%rip)', asm) diff --git a/llvm/utils/update_llc_test_checks.py b/llvm/utils/update_llc_test_checks.py index b5422bd..2826b16 100755 --- a/llvm/utils/update_llc_test_checks.py +++ b/llvm/utils/update_llc_test_checks.py @@ -28,8 +28,13 @@ def main(): '--extra_scrub', action='store_true', help='Always use additional regex to further reduce diffs between various subtargets') parser.add_argument( + '--x86_scrub_sp', action='store_true', default=True, + help='Use regex for x86 sp matching to reduce diffs between various subtargets') + parser.add_argument( + '--no_x86_scrub_sp', action='store_false', dest='x86_scrub_sp') + parser.add_argument( '--x86_scrub_rip', action='store_true', default=True, - help='Use more regex for x86 matching to reduce diffs between various subtargets') + help='Use more regex for x86 rip matching to reduce diffs between various subtargets') parser.add_argument( '--no_x86_scrub_rip', action='store_false', dest='x86_scrub_rip') parser.add_argument( |