[PATCH] D64036: [Bitcode] Update CHECK-DAG usage in tests

[Joel E. Denny via Phabricator via llvm-commits]

jdenny created this revision.
jdenny added reviewers: mehdi_amini, sfertile, kzhuravl, pcc, probinson.
Herald added subscribers: dexonsmith, steven_wu.
Herald added a project: LLVM.

This patch adjusts tests not to depend on deprecated FileCheck
behavior that permits overlapping matches within a block of
`CHECK-DAG` directives:

1. `thinlto-function-summary-originalnames.ll`: The directive with the pattern `<COMBINED` is surely intended to match `<COMBINED ` (note the trailing space), but it instead matches `COMBINED_GLOBALVAR_INIT_REFS`, for which there is a separate directive.  With the deprecated behavior, both directives match the latter text and neither match the former text.  I've adjusted the former directive so it matches only the former text.

2. `thinlto-summary-local-5.0.ll`: Two directives have identical patterns when they were clearly meant to have different patterns.

3. `upgrade-pointer-address-space.ll`: There are three identical directives but only one occurrence of the matching text.  With the deprecated behavior, they always match exactly the same text, so the behavior can't have been useful.  I removed two of the directives.

While I have attempted to preserve the original intent of these tests,
I might have misunderstood something, so please point out any
problems.  Your explanation might prove helpful as I address similar
issues in other tests.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D64036

Files:
  llvm/test/Bitcode/thinlto-function-summary-originalnames.ll
  llvm/test/Bitcode/thinlto-summary-local-5.0.ll
  llvm/test/Bitcode/upgrade-pointer-address-space.ll


Index: llvm/test/Bitcode/upgrade-pointer-address-space.ll
===================================================================
--- llvm/test/Bitcode/upgrade-pointer-address-space.ll
+++ llvm/test/Bitcode/upgrade-pointer-address-space.ll
@@ -1,5 +1,3 @@
-; RUN: llvm-dis -o - %s.bc | FileCheck -allow-deprecated-dag-overlap %s
+; RUN: llvm-dis -o - %s.bc | FileCheck %s
 
-; CHECK-DAG: !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !{{[0-9]+}}, size: {{[0-9]+}})
-; CHECK-DAG: !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !{{[0-9]+}}, size: {{[0-9]+}})
-; CHECK-DAG: !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !{{[0-9]+}}, size: {{[0-9]+}})
+; CHECK: !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !{{[0-9]+}}, size: {{[0-9]+}})
Index: llvm/test/Bitcode/thinlto-summary-local-5.0.ll
===================================================================
--- llvm/test/Bitcode/thinlto-summary-local-5.0.ll
+++ llvm/test/Bitcode/thinlto-summary-local-5.0.ll
@@ -2,8 +2,8 @@
 ; Checks that older bitcode summaries without the dso_local op are still
 ; properly parsed and don't set GlobalValues as dso_local.
 
-; RUN: llvm-dis < %s.bc | FileCheck -allow-deprecated-dag-overlap %s
-; RUN: llvm-bcanalyzer -dump %s.bc | FileCheck -allow-deprecated-dag-overlap %s --check-prefix=BCAN
+; RUN: llvm-dis < %s.bc | FileCheck %s
+; RUN: llvm-bcanalyzer -dump %s.bc | FileCheck %s --check-prefix=BCAN
 
 define void @foo() {
 ;CHECK-DAG:define void @foo()
@@ -14,7 +14,7 @@
 ;CHECK-DAG: @bar = global i32 0
 
 @baz = alias i32, i32* @bar
-;CHECK-DAG: @bar = global i32 0
+;CHECK-DAG: @baz = alias i32, i32* @bar
 
 ;BCAN: <SOURCE_FILENAME
 ;BCAN-NEXT: <GLOBALVAR {{.*}} op7=0/>
Index: llvm/test/Bitcode/thinlto-function-summary-originalnames.ll
===================================================================
--- llvm/test/Bitcode/thinlto-function-summary-originalnames.ll
+++ llvm/test/Bitcode/thinlto-function-summary-originalnames.ll
@@ -1,7 +1,7 @@
 ; Test to check the callgraph in summary
 ; RUN: opt -module-summary %s -o %t.o
 ; RUN: llvm-lto -thinlto-action=thinlink -o %t.index.bc %t.o
-; RUN: llvm-bcanalyzer -dump %t.index.bc | FileCheck -allow-deprecated-dag-overlap %s --check-prefix=COMBINED
+; RUN: llvm-bcanalyzer -dump %t.index.bc | FileCheck %s --check-prefix=COMBINED
 
 ; COMBINED:       <GLOBALVAL_SUMMARY_BLOCK
 ; COMBINED-NEXT:    <VERSION
@@ -9,7 +9,7 @@
 ; COMBINED-NEXT:    <VALUE_GUID {{.*}} op1=4947176790635855146/>
 ; COMBINED-NEXT:    <VALUE_GUID {{.*}} op1=-6591587165810580810/>
 ; COMBINED-NEXT:    <VALUE_GUID {{.*}} op1=-4377693495213223786/>
-; COMBINED-DAG:    <COMBINED
+; COMBINED-DAG:    <COMBINED{{ }}
 ; COMBINED-DAG:    <COMBINED_ORIGINAL_NAME op0=6699318081062747564/>
 ; COMBINED-DAG:    <COMBINED_GLOBALVAR_INIT_REFS
 ; COMBINED-DAG:    <COMBINED_ORIGINAL_NAME op0=-2012135647395072713/>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64036.207409.patch
Type: text/x-patch
Size: 2847 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190701/dfaae24e/attachment.bin>