diff options
| author | Johannes Doerfert <johannes@jdoerfert.de> | 2023-07-14 12:20:57 -0700 |
|---|---|---|
| committer | Johannes Doerfert <johannes@jdoerfert.de> | 2023-07-14 13:53:36 -0700 |
| commit | 5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72 (patch) | |
| tree | 85e77dc3c8437bd9ec19bdfbfac0a2f895f14506 /llvm | |
| parent | 0dcc78a1a6d80c27e5b8824b820ba9441a90c7b8 (diff) | |
| download | llvm-5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72.zip llvm-5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72.tar.gz llvm-5b8b9b39ccd06989b722f8d0adad0aa4da6d7d72.tar.bz2 | |
Revert "[UTC] Adapt version matcher to glob CLANG_VENDOR"
This reverts commit 68f5d1be3d8f9b2ee2f25098203b24a32057b4e6 as it is
built on top of https://reviews.llvm.org/D148216 which is broken.
See also https://github.com/llvm/llvm-project/issues/63746
Diffstat (limited to 'llvm')
3 files changed, 9 insertions, 8 deletions
diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.globals.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.globals.expected index ea35ec5..a867c34 100644 --- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.globals.expected +++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.globals.expected @@ -250,13 +250,13 @@ attributes #3 = { nounwind } ; CHECK: attributes #[[ATTR2:[0-9]+]] = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) } ; CHECK: attributes #[[ATTR3]] = { nounwind } ;. -; CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C99, file: [[META1:![0-9]+]], producer: "{{.*}}clang version {{.*}}", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: [[META2:![0-9]+]], splitDebugInlining: false, nameTableKind: None) +; CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C99, file: [[META1:![0-9]+]], producer: "clang version {{.*}}", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: [[META2:![0-9]+]], splitDebugInlining: false, nameTableKind: None) ; CHECK: [[META1]] = !DIFile(filename: "various_ir_values.c", directory: {{.*}}) ; CHECK: [[META2]] = !{} ; CHECK: [[META3:![0-9]+]] = !{i32 7, !"Dwarf Version", i32 4} ; CHECK: [[META4:![0-9]+]] = !{i32 2, !"Debug Info Version", i32 3} ; CHECK: [[META5:![0-9]+]] = !{i32 1, !"wchar_size", i32 4} -; CHECK: [[META6:![0-9]+]] = !{!"{{.*}}clang version {{.*}}"} +; CHECK: [[META6:![0-9]+]] = !{!"clang version {{.*}}"} ; CHECK: [[DBG7]] = distinct !DISubprogram(name: "foo", scope: [[META1]], file: [[META1]], line: 1, type: [[META8:![0-9]+]], scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: [[META0]], retainedNodes: [[META12:![0-9]+]]) ; CHECK: [[META8]] = !DISubroutineType(types: [[META9:![0-9]+]]) ; CHECK: [[META9]] = !{null, [[META10:![0-9]+]]} diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.transitiveglobals.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.transitiveglobals.expected index 73d1705..debe091 100644 --- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.transitiveglobals.expected +++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values.ll.funcsig.transitiveglobals.expected @@ -243,7 +243,7 @@ attributes #3 = { nounwind } !61 = !{!"branch_weights", i32 1, i32 1048575} !62 = distinct !DIAssignID() ;. -; CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C99, file: [[META1:![0-9]+]], producer: "{{.*}}clang version {{.*}}", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: [[META2:![0-9]+]], splitDebugInlining: false, nameTableKind: None) +; CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C99, file: [[META1:![0-9]+]], producer: "clang version {{.*}}", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: [[META2:![0-9]+]], splitDebugInlining: false, nameTableKind: None) ; CHECK: [[META1]] = !DIFile(filename: "various_ir_values.c", directory: {{.*}}) ; CHECK: [[META2]] = !{} ; CHECK: [[META7:![0-9]+]] = distinct !DISubprogram(name: "foo", scope: [[META1]], file: [[META1]], line: 1, type: [[META8:![0-9]+]], scopeLine: 1, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: [[META0]], retainedNodes: [[META12:![0-9]+]]) diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py index 6f81805..1cc139c 100644 --- a/llvm/utils/UpdateTestChecks/common.py +++ b/llvm/utils/UpdateTestChecks/common.py @@ -1575,16 +1575,17 @@ def filter_globals_according_to_preference( ] +# The capture group is kept as is, followed by a {{.*}} glob METADATA_FILTERS = [ - (r"(?<=\")(\w+ )?(\w+ version )[\d.]+(?: \([^)]+\))?", r"{{.*}}\2{{.*}}"), # preface with glob also, to capture optional CLANG_VENDOR - (r'(!DIFile\(filename: ".+", directory: )".+"', r"\1{{.*}}"), + r"(\w+ version )[\d.]+(?: \([^)]+\))?", + r'(!DIFile\(filename: ".+", directory: )".+"', ] -METADATA_FILTERS_RE = [(re.compile(f),r) for (f,r) in METADATA_FILTERS] +METADATA_FILTERS_RE = [re.compile(s) for s in METADATA_FILTERS] def filter_unstable_metadata(line): - for (f,replacement) in METADATA_FILTERS_RE: - line = f.sub(replacement, line) + for f in METADATA_FILTERS_RE: + line = f.sub(r"\1{{.*}}", line) return line |