Rebase cleanup

anza-xyz · Jan 4, 2024 · a728f2c · a728f2c
1 parent 2c41175
commit a728f2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/llvm/lib/Target/SBF/SBFInstrInfo.td b/llvm/lib/Target/SBF/SBFInstrInfo.td
@@ -57,9 +57,6 @@ def SBFNoALU32 : Predicate<"!Subtarget->getHasAlu32()">;
 def SBFSubtargetSolana : Predicate<"Subtarget->isSolana()">;
 def SBFHasLddw : Predicate<"!Subtarget->getNoLddw()">;
 def SBFNoLddw : Predicate<"Subtarget->getNoLddw()">;
-
-def SBFv2 : Predicate<"Subtarget->isSBFv2()">;
-def NoSBFv2 : Predicate<"!Subtarget->isSBFv2()">;
 def SBFHasNeg : Predicate<"!Subtarget->getDisableNeg()">;
 def SBFNoNeg: Predicate<"Subtarget->getDisableNeg()">;
 def SBFRevSub : Predicate<"Subtarget->getReverseSubImm()">;

diff --git a/llvm/lib/Target/SBF/SBFSubtarget.cpp b/llvm/lib/Target/SBF/SBFSubtarget.cpp
@@ -39,11 +39,15 @@ void SBFSubtarget::initializeEnvironment(const Triple &TT) {
   HasJmpExt = false;
   HasJmp32 = false;
   HasAlu32 = false;
-  HasDynamicFrames = false;
   HasSdiv = false;
   UseDwarfRIS = false;
+
+  // SBFv2 features
+  HasDynamicFrames = false;
+  DisableNeg = false;
+  ReverseSubImm = false;
+  NoLddw = false;
   CallxRegSrc = false;
-  IsSBFv2 = false;
 }
 
 void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
@@ -67,7 +71,6 @@ void SBFSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
   }
 
   if (CPU == "sbfv2") {
-    IsSBFv2 = true;
     if (!HasDynamicFrames)
       report_fatal_error("sbfv2 requires dynamic-frames\n", false);
   }

diff --git a/llvm/lib/Target/SBF/SBFSubtarget.h b/llvm/lib/Target/SBF/SBFSubtarget.h
@@ -72,17 +72,14 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   // whether we should enable MCAsmInfo DwarfUsesRelocationsAcrossSections
   bool UseDwarfRIS;
 
-  // whether we are targeting SBFv2
-  bool IsSBFv2;
-
   // Whether to disable the negate (neg) instruction
   bool DisableNeg;
 
   // Whether to consider 'sub reg, imm' as 'reg = imm - reg', instead of 'reg =
   // reg - imm'.
   bool ReverseSubImm;
 
-  // wether we should use the LDDW instruction
+  // Whether we should use the LDDW instruction
   bool NoLddw;
 
   // Whether to encode destination register in Callx's src field
@@ -107,7 +104,6 @@ class SBFSubtarget : public SBFGenSubtargetInfo {
   bool getHasDynamicFrames() const { return HasDynamicFrames; }
   bool getHasSdiv() const { return HasSdiv; }
   bool getUseDwarfRIS() const { return UseDwarfRIS; }
-  bool isSBFv2() const { return IsSBFv2; }
   bool getDisableNeg() const { return DisableNeg; }
   bool getReverseSubImm() const { return ReverseSubImm; }
   bool getNoLddw() const { return NoLddw; }

diff --git a/llvm/test/MC/SBF/sbf-jmp.s b/llvm/test/MC/SBF/sbf-jmp.s
@@ -3,7 +3,7 @@
 # RUN: llvm-mc %s -triple=sbf-solana-solana --show-encoding \
 # RUN:     | FileCheck %s --check-prefix=CHECK-ASM-OLD
 # RUN: llvm-mc %s -triple=sbf-solana-solana --mcpu=sbfv2 -filetype=obj \
-# RUN:     | llvm-objdump --mcpu=sbfv2 -d -r - \
+# RUN:     | llvm-objdump -d -r - \
 # RUN:     | FileCheck --check-prefix=CHECK-OBJ-NEW %s
 # RUN: llvm-mc %s -triple=sbf-solana-solana -filetype=obj \
 # RUN:     | llvm-objdump -d -r - \