From 93bf15799358c28920c74d9ae1d25c931ddac48d Mon Sep 17 00:00:00 2001 From: Dylan McKay Date: Fri, 5 Feb 2021 04:18:48 +1300 Subject: [PATCH] [AVR] Fix up a few accidentally-regressed Generic CodeGen tests recently broken In 85e8e6246e0fcc62ba727e8fb5990f1a632125d0, these tests were modified to work with AVR, but the regex matchers were finicky and required a fix forward patch, being this. --- test/CodeGen/Generic/MIRDebugify/locations-and-values.mir | 4 ++-- test/CodeGen/Generic/MIRStripDebug/all.mir | 2 +- .../Generic/MIRStripDebug/dont-strip-real-debug-info.mir | 6 +++--- test/CodeGen/Generic/MIRStripDebug/multiple-moduleflags.mir | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/CodeGen/Generic/MIRDebugify/locations-and-values.mir b/test/CodeGen/Generic/MIRDebugify/locations-and-values.mir index 13990caadfd..5145349a349 100644 --- a/test/CodeGen/Generic/MIRDebugify/locations-and-values.mir +++ b/test/CodeGen/Generic/MIRDebugify/locations-and-values.mir @@ -9,10 +9,10 @@ define i32 @test(i32 %a, i32 %b) { %add = add i32 %a, 2 ; ALL-NEXT: %add = add i32 %a, 2, !dbg [[L1:![0-9]+]] - ; VALUE-NEXT: call {{(addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %add, metadata [[add:![0-9]+]], metadata !DIExpression()), !dbg [[L1]] + ; VALUE-NEXT: call{{( addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %add, metadata [[add:![0-9]+]], metadata !DIExpression()), !dbg [[L1]] %sub = sub i32 %add, %b ; ALL-NEXT: %sub = sub i32 %add, %b, !dbg [[L2:![0-9]+]] - ; VALUE-NEXT: call {{(addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %sub, metadata [[sub:![0-9]+]], metadata !DIExpression()), !dbg [[L2]] + ; VALUE-NEXT: call{{( addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %sub, metadata [[sub:![0-9]+]], metadata !DIExpression()), !dbg [[L2]] ; ALL-NEXT: ret i32 %sub, !dbg [[L3:![0-9]+]] ret i32 %sub } diff --git a/test/CodeGen/Generic/MIRStripDebug/all.mir b/test/CodeGen/Generic/MIRStripDebug/all.mir index 48996885186..7af3dde811f 100644 --- a/test/CodeGen/Generic/MIRStripDebug/all.mir +++ b/test/CodeGen/Generic/MIRStripDebug/all.mir @@ -11,7 +11,7 @@ call void @llvm.dbg.value(metadata i32 %sub, metadata !11, metadata !DIExpression()), !dbg !13 ret i32 %sub, !dbg !14 } - ; CHECK-LABEL: define i32 @test(i32 %a, i32 %b) {{(addrspace\([0-9]+\))?}} { + ; CHECK-LABEL: define i32 @test(i32 %a, i32 %b) {{(addrspace\([0-9]+\) )?}}{ ; CHECK-NEXT: %add = add i32 %a, 2 ; CHECK-NEXT: %sub = sub i32 %add, %b ; CHECK-NEXT: ret i32 %sub diff --git a/test/CodeGen/Generic/MIRStripDebug/dont-strip-real-debug-info.mir b/test/CodeGen/Generic/MIRStripDebug/dont-strip-real-debug-info.mir index 6cc8c246f53..329f3b0a55f 100644 --- a/test/CodeGen/Generic/MIRStripDebug/dont-strip-real-debug-info.mir +++ b/test/CodeGen/Generic/MIRStripDebug/dont-strip-real-debug-info.mir @@ -11,11 +11,11 @@ call void @llvm.dbg.value(metadata i32 %sub, metadata !9, metadata !DIExpression()), !dbg !11 ret i32 %sub, !dbg !12 } - ; CHECK-LABEL: define i32 @test(i32 %a, i32 %b) {{(addrspace\([0-9]+\))?}} !dbg !4 { + ; CHECK-LABEL: define i32 @test(i32 %a, i32 %b) {{(addrspace\([0-9]+\) )?}}!dbg !4 { ; CHECK-NEXT: %add = add i32 %a, 2, !dbg !10 - ; CHECK-NEXT: call {{(addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %add, metadata !7, metadata !DIExpression()), !dbg !10 + ; CHECK-NEXT: call{{( addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %add, metadata !7, metadata !DIExpression()), !dbg !10 ; CHECK-NEXT: %sub = sub i32 %add, %b, !dbg !11 - ; CHECK-NEXT: call {{(addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %sub, metadata !9, metadata !DIExpression()), !dbg !11 + ; CHECK-NEXT: call{{( addrspace\([0-9]+\))?}} void @llvm.dbg.value(metadata i32 %sub, metadata !9, metadata !DIExpression()), !dbg !11 ; CHECK-NEXT: ret i32 %sub, !dbg !12 ; CHECK-NEXT: } diff --git a/test/CodeGen/Generic/MIRStripDebug/multiple-moduleflags.mir b/test/CodeGen/Generic/MIRStripDebug/multiple-moduleflags.mir index df280cf0a48..792e1d47a42 100644 --- a/test/CodeGen/Generic/MIRStripDebug/multiple-moduleflags.mir +++ b/test/CodeGen/Generic/MIRStripDebug/multiple-moduleflags.mir @@ -11,7 +11,7 @@ call void @llvm.dbg.value(metadata i32 %sub, metadata !11, metadata !DIExpression()), !dbg !13 ret i32 %sub, !dbg !14 } - ; CHECK-LABEL: define i32 @test(i32 %a, i32 %b) {{(addrspace\([0-9]+\))?}} { + ; CHECK-LABEL: define i32 @test(i32 %a, i32 %b) {{(addrspace\([0-9]+\) )?}}{ ; CHECK-NEXT: %add = add i32 %a, 2 ; CHECK-NEXT: %sub = sub i32 %add, %b ; CHECK-NEXT: ret i32 %sub