Skip to content

Conversation

@sjoerdmeijer
Copy link
Collaborator

Reverts #156300

Need to look at the X86 test failures.

@llvmbot
Copy link
Member

llvmbot commented Sep 3, 2025

@llvm/pr-subscribers-tools-llvm-exegesis

Author: Sjoerd Meijer (sjoerdmeijer)

Changes

Reverts llvm/llvm-project#156300

Need to look at the X86 test failures.


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

2 Files Affected:

  • (removed) llvm/test/tools/llvm-exegesis/AArch64/no-aliasing-ld-str.s (-8)
  • (modified) llvm/tools/llvm-exegesis/lib/MCInstrDescView.cpp (-2)
diff --git a/llvm/test/tools/llvm-exegesis/AArch64/no-aliasing-ld-str.s b/llvm/test/tools/llvm-exegesis/AArch64/no-aliasing-ld-str.s
deleted file mode 100644
index 65e1203bb275d..0000000000000
--- a/llvm/test/tools/llvm-exegesis/AArch64/no-aliasing-ld-str.s
+++ /dev/null
@@ -1,8 +0,0 @@
-REQUIRES: aarch64-registered-target
-
-RUN: llvm-exegesis -mtriple=aarch64 -mcpu=neoverse-v2 -mode=latency --dump-object-to-disk=%d --opcode-name=FMOVWSr --benchmark-phase=assemble-measured-code 2>&1
-RUN: llvm-objdump -d %d > %t.s
-RUN: FileCheck %s < %t.s
-
-CHECK-NOT: ld{{[1-4]}}
-CHECK-NOT: st{{[1-4]}}
diff --git a/llvm/tools/llvm-exegesis/lib/MCInstrDescView.cpp b/llvm/tools/llvm-exegesis/lib/MCInstrDescView.cpp
index d2d9b31df5197..66c770d9ca86b 100644
--- a/llvm/tools/llvm-exegesis/lib/MCInstrDescView.cpp
+++ b/llvm/tools/llvm-exegesis/lib/MCInstrDescView.cpp
@@ -206,8 +206,6 @@ const Operand &Instruction::getPrimaryOperand(const Variable &Var) const {
 }
 
 bool Instruction::hasMemoryOperands() const {
-  if (Description.mayLoad() || Description.mayStore())
-    return true;
   return any_of(Operands, [](const Operand &Op) {
     return Op.isReg() && Op.isExplicit() && Op.isMemory();
   });

@sjoerdmeijer sjoerdmeijer merged commit b15c6c2 into main Sep 3, 2025
11 checks passed
@sjoerdmeijer sjoerdmeijer deleted the revert-156300-exegesis-no-aliasing-ld-st branch September 3, 2025 19:43
searlmc1 pushed a commit to ROCm/llvm-project that referenced this pull request Sep 4, 2025
sjoerdmeijer added a commit to sjoerdmeijer/llvm-project that referenced this pull request Sep 17, 2025
…on set" (llvm#156735)

Move the mayLoad/mayStore checks out of hasMemoryOperands; there are
instructions with these properties that don't have operands.
sjoerdmeijer added a commit that referenced this pull request Oct 6, 2025
…on set" (#156735) (#159366)

Move the mayLoad/mayStore checks out of hasMemoryOperands; there are
instructions with these properties that don't have operands.

This is relanding 899ee37 with a 
minor tweak.
aokblast pushed a commit to aokblast/llvm-project that referenced this pull request Oct 6, 2025
…on set" (llvm#156735) (llvm#159366)

Move the mayLoad/mayStore checks out of hasMemoryOperands; there are
instructions with these properties that don't have operands.

This is relanding 899ee37 with a 
minor tweak.
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.

3 participants