Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MTE] Fix test #85875

Merged
merged 2 commits into from
Mar 22, 2024
Merged

[MTE] Fix test #85875

merged 2 commits into from
Mar 22, 2024

Conversation

fmayer
Copy link
Contributor

@fmayer fmayer commented Mar 19, 2024

llc runs the stack tagging instrumentation, so if we run opt before, we
double instrument

Created using spr 1.3.4
@llvmbot
Copy link
Collaborator

llvmbot commented Mar 19, 2024

@llvm/pr-subscribers-backend-aarch64

Author: Florian Mayer (fmayer)

Changes

llc runs the stack tagging instrumentation, so if we run opt before, we
double instrument


Full diff: https://github.com/llvm/llvm-project/pull/85875.diff

1 Files Affected:

  • (modified) llvm/test/CodeGen/AArch64/stack-tagging-stack-coloring.ll (+3-5)
diff --git a/llvm/test/CodeGen/AArch64/stack-tagging-stack-coloring.ll b/llvm/test/CodeGen/AArch64/stack-tagging-stack-coloring.ll
index 81349620fb7725..6790c21d19bcf3 100644
--- a/llvm/test/CodeGen/AArch64/stack-tagging-stack-coloring.ll
+++ b/llvm/test/CodeGen/AArch64/stack-tagging-stack-coloring.ll
@@ -1,17 +1,15 @@
 ; Test that storage for allocas with disjoint lifetimes is reused with stack
 ; tagging.
 
-; RUN: opt -S -aarch64-stack-tagging -stack-tagging-use-stack-safety=0 %s -o - | \
-; RUN:   llc --mattr=+mte -no-stack-coloring=false -o - | \
+; RUN: llc --mattr=+mte -no-stack-coloring=false -stack-tagging-use-stack-safety=0 -o - %s | \
 ; RUN:   FileCheck %s --check-prefix=COLOR
-; RUN: opt -S -aarch64-stack-tagging %s -stack-tagging-use-stack-safety=0 -o - | \
-; RUN:   llc --mattr=+mte -no-stack-coloring=true -o - | \
+; RUN:  llc --mattr=+mte -no-stack-coloring=true -stack-tagging-use-stack-safety=0 -o - %s | \
 ; RUN:   FileCheck %s --check-prefix=NOCOLOR
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64"
 
-; COLOR: sub	sp, sp, #208
+; COLOR: sub	sp, sp, #192
 ; NOCOLOR: sub	sp, sp, #336
 
 define i32 @myCall_w2(i32 %in) sanitize_memtag {

@fmayer fmayer changed the title Fix test [MTE] Fix test Mar 19, 2024
@fmayer fmayer requested a review from eugenis March 19, 2024 23:01
Copy link
Contributor

@eugenis eugenis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fmayer fmayer merged commit 215f105 into main Mar 22, 2024
4 checks passed
@fmayer fmayer deleted the users/fmayer/spr/fix-test branch March 22, 2024 21:14
fmayer added a commit to fmayer/llvm-project that referenced this pull request Apr 11, 2024
llc runs the stack tagging instrumentation, so if we run opt before, we
double instrument

Reviewers: eugenis

Pull Request: llvm#85875
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants