This is an archive of the discontinued LLVM Phabricator instance.

Differential D125084

[test, x86] Fix spurious x86-target-features.c failure
ClosedPublic

Authored by thopre on May 6 2022, 1:53 AM.

Details

Reviewers
sconstab
craig.topper
andrew.w.kaylor
zbrid
chandlerc
pengfei
Commits
rG7e65ffaa8bb6: [test, x86] Fix spurious x86-target-features.c failure
Summary

x86-target-features.c can spuriously fail when checking for absence of
the string "lvi" in the compiler output due to the temporary path used
for the output file. For example:
"-o" "/tmp/lit-tmp-981j7lvi/x86-target-features-670b86.o"
will make the test fail. This commit checks specifically for lvi as a
target feature, in a similar way to the positive CHECK directive just
above.

Test Plan: fails when using -mlvi-hardening and pass otherwise

Diff Detail

Event Timeline

thopre created this revision.May 6 2022, 1:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 6 2022, 1:53 AM
Herald added subscribers: StephenFan, pengfei. · View Herald Transcript
thopre requested review of this revision.May 6 2022, 1:53 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 6 2022, 1:53 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B163091: Diff 427563.May 6 2022, 2:56 AM
thopre added a comment.May 17 2022, 4:04 AM

Ping?

pengfei added inline comments.May 17 2022, 6:18 AM
clang/test/Driver/x86-target-features.c
173

How about just // NO-LVIHARDENING-NOT: "+lvi-? It should be distinct enough. We intentionally use less combination on a negative test.

thopre updated this revision to Diff 430029.May 17 2022, 6:38 AM
thopre marked an inline comment as done.

Be more conservative in what we reject

Harbormaster completed remote builds in B164866: Diff 430029.May 17 2022, 7:38 AM
pengfei accepted this revision.May 17 2022, 8:00 AM

LGTM. Thanks!

This revision is now accepted and ready to land.May 17 2022, 8:00 AM
Closed by commit rG7e65ffaa8bb6: [test, x86] Fix spurious x86-target-features.c failure (authored by thopre). · Explain WhyMay 18 2022, 1:27 AM
This revision was automatically updated to reflect the committed changes.
thopre added a commit: rG7e65ffaa8bb6: [test, x86] Fix spurious x86-target-features.c failure.

Revision Contents

PathSize
clang/
test/
Driver/
2 lines

Diff 430271

clang/test/Driver/x86-target-features.c

Show First 20 Lines • Show All 164 Lines • ▼ Show 20 Lines
// RUN: %clang -target i386-linux-gnu -mlvi-cfi -mretpoline %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVICFI-RETPOLINE %s // RUN: %clang -target i386-linux-gnu -mlvi-cfi -mretpoline %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVICFI-RETPOLINE %s
// LVICFI-RETPOLINE: error: invalid argument 'mretpoline' not allowed with 'mlvi-cfi' // LVICFI-RETPOLINE: error: invalid argument 'mretpoline' not allowed with 'mlvi-cfi'
// RUN: %clang -target i386-linux-gnu -mlvi-cfi -mretpoline-external-thunk %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVICFI-RETPOLINE-EXTERNAL-THUNK %s // RUN: %clang -target i386-linux-gnu -mlvi-cfi -mretpoline-external-thunk %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVICFI-RETPOLINE-EXTERNAL-THUNK %s
// LVICFI-RETPOLINE-EXTERNAL-THUNK: error: invalid argument 'mretpoline-external-thunk' not allowed with 'mlvi-cfi' // LVICFI-RETPOLINE-EXTERNAL-THUNK: error: invalid argument 'mretpoline-external-thunk' not allowed with 'mlvi-cfi'
// RUN: %clang -target i386-linux-gnu -mlvi-hardening %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING %s // RUN: %clang -target i386-linux-gnu -mlvi-hardening %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING %s
// RUN: %clang -target i386-linux-gnu -mno-lvi-hardening %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-LVIHARDENING %s // RUN: %clang -target i386-linux-gnu -mno-lvi-hardening %s -### -o %t.o 2>&1 | FileCheck -check-prefix=NO-LVIHARDENING %s
// LVIHARDENING: "-target-feature" "+lvi-load-hardening" "-target-feature" "+lvi-cfi" // LVIHARDENING: "-target-feature" "+lvi-load-hardening" "-target-feature" "+lvi-cfi"
// NO-LVIHARDENING-NOT: lvi // NO-LVIHARDENING-NOT: "+lvi-
pengfeiUnsubmitted
Done
ReplyInline Actions

How about just // NO-LVIHARDENING-NOT: "+lvi-? It should be distinct enough. We intentionally use less combination on a negative test.

pengfei: How about just `// NO-LVIHARDENING-NOT: "+lvi-`? It should be distinct enough. We intentionally…
// RUN: %clang -target i386-linux-gnu -mlvi-hardening -mspeculative-load-hardening %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING-SLH %s // RUN: %clang -target i386-linux-gnu -mlvi-hardening -mspeculative-load-hardening %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING-SLH %s
// LVIHARDENING-SLH: error: invalid argument 'mspeculative-load-hardening' not allowed with 'mlvi-hardening' // LVIHARDENING-SLH: error: invalid argument 'mspeculative-load-hardening' not allowed with 'mlvi-hardening'
// RUN: %clang -target i386-linux-gnu -mlvi-hardening -mretpoline %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING-RETPOLINE %s // RUN: %clang -target i386-linux-gnu -mlvi-hardening -mretpoline %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING-RETPOLINE %s
// LVIHARDENING-RETPOLINE: error: invalid argument 'mretpoline' not allowed with 'mlvi-hardening' // LVIHARDENING-RETPOLINE: error: invalid argument 'mretpoline' not allowed with 'mlvi-hardening'
// RUN: %clang -target i386-linux-gnu -mlvi-hardening -mretpoline-external-thunk %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING-RETPOLINE-EXTERNAL-THUNK %s // RUN: %clang -target i386-linux-gnu -mlvi-hardening -mretpoline-external-thunk %s -### -o %t.o 2>&1 | FileCheck -check-prefix=LVIHARDENING-RETPOLINE-EXTERNAL-THUNK %s
// LVIHARDENING-RETPOLINE-EXTERNAL-THUNK: error: invalid argument 'mretpoline-external-thunk' not allowed with 'mlvi-hardening' // LVIHARDENING-RETPOLINE-EXTERNAL-THUNK: error: invalid argument 'mretpoline-external-thunk' not allowed with 'mlvi-hardening'
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines