This is an archive of the discontinued LLVM Phabricator instance.

[test] Fix mix of variable use/def and regex match
ClosedPublic

Authored by thopre on Mar 18 2021, 4:00 AM.

Download Raw Diff

Details

Reviewers

tejohnson
evgeny777
pcc
eugenis

Commits

rGc5d53efeff5c: [test] Fix mix of variable use/def and regex match

Summary

LLVM test Transforms/GlobalSplit/basic.ll mixes variable definition and
variable use with regex matching of end of line. Mixing end of line
matching with variable definition will work but not record the end of
line in the string variable. Mixing end of line with variable use will
ignore end of line and cause an error once D98691 is landed.

This commit moves the end of line matching out of the string subtitution
blocks.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

thopre requested review of this revision.Mar 18 2021, 4:00 AM

thopre created this revision.

Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2021, 4:01 AM

Herald added a subscriber: llvm-commits. · View Herald Transcript

thopre mentioned this in D98691: [FileCheck] Fix PR49531: invalid use of string var.Mar 18 2021, 4:01 AM

Harbormaster completed remote builds in B94427: Diff 331513.Mar 18 2021, 4:37 AM

thopre added a reviewer: eugenis.Mar 18 2021, 5:52 AM

lgtm

This revision is now accepted and ready to land.Mar 18 2021, 7:43 AM

Closed by commit rGc5d53efeff5c: [test] Fix mix of variable use/def and regex match (authored by thopre). · Explain WhyMar 24 2021, 10:58 AM

This revision was automatically updated to reflect the committed changes.

thopre added a commit: rGc5d53efeff5c: [test] Fix mix of variable use/def and regex match.

Revision Contents

Path

Size

llvm/

test/

Transforms/

GlobalSplit/

basic.ll

4 lines

Diff 331513

llvm/test/Transforms/GlobalSplit/basic.ll

	; RUN: opt -S -globalsplit %s \| FileCheck %s			; RUN: opt -S -globalsplit %s \| FileCheck %s
	; RUN: opt -S -passes=globalsplit %s \| FileCheck %s			; RUN: opt -S -passes=globalsplit %s \| FileCheck %s

	target datalayout = "e-p:64:64"			target datalayout = "e-p:64:64"
	target triple = "x86_64-unknown-linux-gnu"			target triple = "x86_64-unknown-linux-gnu"

	; CHECK: @vtt = constant [3 x i8] [i8 bitcast ([2 x i8* ()] @global.0 to i8), i8 bitcast (i8* ()** getelementptr inbounds ([2 x i8* ()], [2 x i8 ()] @global.0, i32 0, i32 1) to i8), i8 bitcast ([1 x i8* ()] @global.1 to i8*)]			; CHECK: @vtt = constant [3 x i8] [i8 bitcast ([2 x i8* ()] @global.0 to i8), i8 bitcast (i8* ()** getelementptr inbounds ([2 x i8* ()], [2 x i8 ()] @global.0, i32 0, i32 1) to i8), i8 bitcast ([1 x i8* ()] @global.1 to i8*)]
	@vtt = constant [3 x i8*] [			@vtt = constant [3 x i8*] [
	i8* bitcast (i8* ()** getelementptr ({ [2 x i8* ()], [1 x i8 ()] }, { [2 x i8 ()], [1 x i8 ()] } @global, i32 0, inrange i32 0, i32 0) to i8*),			i8* bitcast (i8* ()** getelementptr ({ [2 x i8* ()], [1 x i8 ()] }, { [2 x i8 ()], [1 x i8 ()] } @global, i32 0, inrange i32 0, i32 0) to i8*),
	i8* bitcast (i8* ()** getelementptr ({ [2 x i8* ()], [1 x i8 ()] }, { [2 x i8 ()], [1 x i8 ()] } @global, i32 0, inrange i32 0, i32 1) to i8*),			i8* bitcast (i8* ()** getelementptr ({ [2 x i8* ()], [1 x i8 ()] }, { [2 x i8 ()], [1 x i8 ()] } @global, i32 0, inrange i32 0, i32 1) to i8*),
	i8* bitcast (i8* ()** getelementptr ({ [2 x i8* ()], [1 x i8 ()] }, { [2 x i8 ()], [1 x i8 ()] } @global, i32 0, inrange i32 1, i32 0) to i8*)			i8* bitcast (i8* ()** getelementptr ({ [2 x i8* ()], [1 x i8 ()] }, { [2 x i8 ()], [1 x i8 ()] } @global, i32 0, inrange i32 1, i32 0) to i8*)
	]			]

	; CHECK-NOT: @global =			; CHECK-NOT: @global =
	; CHECK: @global.0 = private constant [2 x i8* ()] [i8 ()* @f1, i8* ()* @f2], !type [[T1:![0-9]+]], !type [[T2:![0-9]+]], !type [[T3:![0-9]+]], !vcall_visibility [[VIS:![0-9]+$]]			; CHECK: @global.0 = private constant [2 x i8* ()] [i8 ()* @f1, i8* ()* @f2], !type [[T1:![0-9]+]], !type [[T2:![0-9]+]], !type [[T3:![0-9]+]], !vcall_visibility [[VIS:![0-9]+]]{{$}}
	; CHECK: @global.1 = private constant [1 x i8* ()] [i8 ()* @f3], !type [[T4:![0-9]+]], !type [[T5:![0-9]+]], !vcall_visibility [[VIS$]]			; CHECK: @global.1 = private constant [1 x i8* ()] [i8 ()* @f3], !type [[T4:![0-9]+]], !type [[T5:![0-9]+]], !vcall_visibility [[VIS]]{{$}}
	; CHECK-NOT: @global =			; CHECK-NOT: @global =
	@global = internal constant { [2 x i8* ()], [1 x i8 ()*] } {			@global = internal constant { [2 x i8* ()], [1 x i8 ()*] } {
	[2 x i8* ()] [i8 ()* @f1, i8* ()* @f2],			[2 x i8* ()] [i8 ()* @f1, i8* ()* @f2],
	[1 x i8* ()] [i8 ()* @f3]			[1 x i8* ()] [i8 ()* @f3]
	}, !type !0, !type !1, !type !2, !type !3, !type !4, !vcall_visibility !5			}, !type !0, !type !1, !type !2, !type !3, !type !4, !vcall_visibility !5

	; CHECK: define i8* @f1()			; CHECK: define i8* @f1()
	define i8* @f1() {			define i8* @f1() {
	▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines