[llvm] 01c97b4 - MCA: Remove relaxInstruction call

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-07-06T15:41:53-07:00
New Revision: 01c97b4953e87ae455bd4c41e3de3f0f0f29c61c

URL: https://github.com/llvm/llvm-project/commit/01c97b4953e87ae455bd4c41e3de3f0f0f29c61c
DIFF: https://github.com/llvm/llvm-project/commit/01c97b4953e87ae455bd4c41e3de3f0f0f29c61c.diff

LOG: MCA: Remove relaxInstruction call

MCA inappropriately called the internal MCAssembler API
(https://reviews.llvm.org/D65948). In addition, most snippets are short.
We should display the short form of span-dependent instructions

Added: 
    

Modified: 
    llvm/lib/MCA/CodeEmitter.cpp
    llvm/test/tools/llvm-mca/X86/show-encoding.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MCA/CodeEmitter.cpp b/llvm/lib/MCA/CodeEmitter.cpp
index b3936a95c06a8..5bc48d9227f4c 100644
--- a/llvm/lib/MCA/CodeEmitter.cpp
+++ b/llvm/lib/MCA/CodeEmitter.cpp
@@ -22,12 +22,8 @@ CodeEmitter::EncodingInfo CodeEmitter::getOrCreateEncodingInfo(unsigned MCID) {
 
   SmallVector<llvm::MCFixup, 2> Fixups;
   const MCInst &Inst = Sequence[MCID];
-  MCInst Relaxed(Sequence[MCID]);
-  if (MAB.mayNeedRelaxation(Inst, STI))
-    MAB.relaxInstruction(Relaxed, STI);
-
   EI.first = Code.size();
-  MCE.encodeInstruction(Relaxed, Code, Fixups, STI);
+  MCE.encodeInstruction(Inst, Code, Fixups, STI);
   EI.second = Code.size() - EI.first;
   return EI;
 }

diff  --git a/llvm/test/tools/llvm-mca/X86/show-encoding.s b/llvm/test/tools/llvm-mca/X86/show-encoding.s
index 9d2015664271c..b20b7fc31cde8 100644
--- a/llvm/test/tools/llvm-mca/X86/show-encoding.s
+++ b/llvm/test/tools/llvm-mca/X86/show-encoding.s
@@ -74,4 +74,4 @@
 # WITHENCODINGS-NEXT:  1      1     0.50                         6     c4 c1 30 c6 c1 ff             vshufps	$255, %xmm9, %xmm9, %xmm0
 # WITHENCODINGS-NEXT:  1      1     1.00           *             6     c4 01 78 11 0c 8b             vmovups	%xmm9, (%r11,%r9,4)
 # WITHENCODINGS-NEXT:  1      1     0.50                         3     44 39 c6                      cmpl	%r8d, %esi
-# WITHENCODINGS-NEXT:  1      1     0.50                         6     0f 8c 00 00 00 00             jl	-90
+# WITHENCODINGS-NEXT:  1      1     0.50                         2     7c 00                         jl	-90