From bbbe5384f1f231d7e206a37d43f30dc3b4975f96 Mon Sep 17 00:00:00 2001 From: Sjoerd Meijer Date: Wed, 3 Sep 2025 20:00:34 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"[llvm-exegesis]=20Exclude=20loads/sto?= =?UTF-8?q?res=20from=20aliasing=20instruction=20set=20(#=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 899ee375e99c04ef2c4a67dc70b266c929ad43f4. --- .../test/tools/llvm-exegesis/AArch64/no-aliasing-ld-str.s | 8 -------- llvm/tools/llvm-exegesis/lib/MCInstrDescView.cpp | 2 -- 2 files changed, 10 deletions(-) delete mode 100644 llvm/test/tools/llvm-exegesis/AArch64/no-aliasing-ld-str.s 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(); });