This is an archive of the discontinued LLVM Phabricator instance.

Differential D99866

[test, AArch64] Fix use of var defined in CHECK-NOT
ClosedPublic

Authored by thopre on Apr 4 2021, 2:04 PM.

Details

Reviewers
kristof.beyls
paquette
aemerson
Commits
rG3ba246719b7c: [test, AArch64] Fix use of var defined in CHECK-NOT
Summary

LLVM test CodeGen/AArch64/speculation-hardening.ll tries to check for
the absence of a sequence of instructions with several CHECK-NOT with
one of those directives using a variable defined in another. However
CHECK-NOT are checked independently so that is using a variable defined
in a pattern that should not occur in the input.

This commit removes the dependency between those CHECK-NOT by replacing
single occurence of the undefined variable by a regex match, and
multiple occurences by a definition followed by a use.

Diff Detail

Event Timeline

thopre created this revision.Apr 4 2021, 2:04 PM
Herald added a subscriber: danielkiss. · View Herald TranscriptApr 4 2021, 2:04 PM
thopre requested review of this revision.Apr 4 2021, 2:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 4 2021, 2:04 PM
Harbormaster completed remote builds in B97064: Diff 335173.Apr 4 2021, 2:37 PM
thopre added a child revision: D86222: Fix PR46880: Fail CHECK-NOT with undefined variable.Apr 5 2021, 1:57 PM
aemerson added inline comments.Apr 6 2021, 10:54 AM
llvm/test/CodeGen/AArch64/speculation-hardening.ll
20

What about TMPREG?

thopre marked an inline comment as done.Apr 6 2021, 12:07 PM
thopre added inline comments.
llvm/test/CodeGen/AArch64/speculation-hardening.ll
20

Using a variable defined on the same line works, it gets translated into a regex backreference. TMPREG will never be defined for use in later directive but FileCheck will check that and (x[0-9]+), \1, x16 does not occur.

aemerson accepted this revision.Apr 6 2021, 12:18 PM
This revision is now accepted and ready to land.Apr 6 2021, 12:18 PM
Closed by commit rG3ba246719b7c: [test, AArch64] Fix use of var defined in CHECK-NOT (authored by thopre). · Explain WhyApr 6 2021, 1:15 PM
This revision was automatically updated to reflect the committed changes.
thopre marked an inline comment as done.
thopre added a commit: rG3ba246719b7c: [test, AArch64] Fix use of var defined in CHECK-NOT.
thopre removed a child revision: D86222: Fix PR46880: Fail CHECK-NOT with undefined variable.Apr 8 2021, 1:45 AM

Revision Contents

PathSize
llvm/
test/
CodeGen/
AArch64/
18 lines

Diff 335644

llvm/test/CodeGen/AArch64/speculation-hardening.ll

Show All 10 Lines
; SLH: cmp sp, #0 ; SLH: cmp sp, #0
; SLH: csetm x16, ne ; SLH: csetm x16, ne
; NOSLH-NOT: cmp sp, #0 ; NOSLH-NOT: cmp sp, #0
; NOSLH-NOT: csetm x16, ne ; NOSLH-NOT: csetm x16, ne
; SLH: mov [[TMPREG:x[0-9]+]], sp ; SLH: mov [[TMPREG:x[0-9]+]], sp
; SLH: and [[TMPREG]], [[TMPREG]], x16 ; SLH: and [[TMPREG]], [[TMPREG]], x16
; SLH: mov sp, [[TMPREG]] ; SLH: mov sp, [[TMPREG]]
; NOSLH-NOT: mov [[TMPREG:x[0-9]+]], sp ; NOSLH-NOT: mov {{x[0-9]+}}, sp
; NOSLH-NOT: and [[TMPREG]], [[TMPREG]], x16 ; NOSLH-NOT: and [[TMPREG:x[0-9]+]], [[TMPREG]], x16
aemersonUnsubmitted
Done
ReplyInline Actions

What about TMPREG?

aemerson: What about TMPREG?
thopreAuthorUnsubmitted
Done
ReplyInline Actions

Using a variable defined on the same line works, it gets translated into a regex backreference. TMPREG will never be defined for use in later directive but FileCheck will check that and (x[0-9]+), \1, x16 does not occur.

thopre: Using a variable defined on the same line works, it gets translated into a regex backreference.
; NOSLH-NOT: mov sp, [[TMPREG]] ; NOSLH-NOT: mov sp, {{x[0-9]+}}
%call = tail call i32 @tail_callee(i32 %i) %call = tail call i32 @tail_callee(i32 %i)
; SLH: cmp sp, #0 ; SLH: cmp sp, #0
; SLH: csetm x16, ne ; SLH: csetm x16, ne
; NOSLH-NOT: cmp sp, #0 ; NOSLH-NOT: cmp sp, #0
; NOSLH-NOT: csetm x16, ne ; NOSLH-NOT: csetm x16, ne
%cmp = icmp slt i32 %call, %N %cmp = icmp slt i32 %call, %N
br i1 %cmp, label %if.then, label %return br i1 %cmp, label %if.then, label %return
; CHECK: b.[[COND:(ge)|(lt)|(ne)|(eq)]] ; CHECK: b.[[COND:(ge)|(lt)|(ne)|(eq)]]
Show All 10 Lines
; SLH-DAG: csel x16, x16, xzr, [[COND]] ; SLH-DAG: csel x16, x16, xzr, [[COND]]
; NOSLH-NOT: csel x16, x16, xzr, [[COND]] ; NOSLH-NOT: csel x16, x16, xzr, [[COND]]
return: ; preds = %entry, %if.then return: ; preds = %entry, %if.then
%retval.0 = phi i32 [ %conv, %if.then ], [ 0, %entry ] %retval.0 = phi i32 [ %conv, %if.then ], [ 0, %entry ]
; SLH: mov [[TMPREG:x[0-9]+]], sp ; SLH: mov [[TMPREG:x[0-9]+]], sp
; SLH: and [[TMPREG]], [[TMPREG]], x16 ; SLH: and [[TMPREG]], [[TMPREG]], x16
; SLH: mov sp, [[TMPREG]] ; SLH: mov sp, [[TMPREG]]
; NOSLH-NOT: mov [[TMPREG:x[0-9]+]], sp ; NOSLH-NOT: mov {{x[0-9]+}}, sp
; NOSLH-NOT: and [[TMPREG]], [[TMPREG]], x16 ; NOSLH-NOT: and [[TMPREG:x[0-9]+]], [[TMPREG]], x16
; NOSLH-NOT: mov sp, [[TMPREG]] ; NOSLH-NOT: mov sp, {{x[0-9]+}}
ret i32 %retval.0 ret i32 %retval.0
} }
; Make sure that for a tail call, taint doesn't get put into SP twice. ; Make sure that for a tail call, taint doesn't get put into SP twice.
define i32 @tail_caller(i32 %a) local_unnamed_addr SLHATTR { define i32 @tail_caller(i32 %a) local_unnamed_addr SLHATTR {
; CHECK-LABEL: tail_caller: ; CHECK-LABEL: tail_caller:
; SLH: mov [[TMPREG:x[0-9]+]], sp ; SLH: mov [[TMPREG:x[0-9]+]], sp
; SLH: and [[TMPREG]], [[TMPREG]], x16 ; SLH: and [[TMPREG]], [[TMPREG]], x16
; SLH: mov sp, [[TMPREG]] ; SLH: mov sp, [[TMPREG]]
; NOSLH-NOT: mov [[TMPREG:x[0-9]+]], sp ; NOSLH-NOT: mov {{x[0-9]+}}, sp
; NOSLH-NOT: and [[TMPREG]], [[TMPREG]], x16 ; NOSLH-NOT: and [[TMPREG:x[0-9]+]], [[TMPREG]], x16
; NOSLH-NOT: mov sp, [[TMPREG]] ; NOSLH-NOT: mov sp, {{x[0-9]+}}
; SLH: b tail_callee ; SLH: b tail_callee
; SLH-NOT: cmp sp, #0 ; SLH-NOT: cmp sp, #0
%call = tail call i32 @tail_callee(i32 %a) %call = tail call i32 @tail_callee(i32 %a)
ret i32 %call ret i32 %call
} }
declare i32 @tail_callee(i32) local_unnamed_addr declare i32 @tail_callee(i32) local_unnamed_addr
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines