[SOL] Associate features for sbpfv3 and v4 (#183)

Author: LucasSte

llvm/lib/Target/SBF/SBFTargetFeatures.td

@@ -72,11 +72,8 @@ def : Proc<"v2", [FeatureDynamicFrames, FeatureDisableLddw,
                   FeatureNewMemEncoding, FeatureCallxRegSrc, FeaturePqrInstr, FeatureExplicitSext,
                   FeatureDisableNeg, FeatureReverseSubImm, ALU32]>;
 
-def : Proc<"v3", [FeatureDynamicFrames, FeatureDisableLddw,
-                  FeatureNewMemEncoding, FeatureCallxRegDst, FeaturePqrInstr, FeatureExplicitSext,
-                  FeatureDisableNeg, FeatureReverseSubImm, ALU32, FeatureStaticSyscalls, FeatureRelocAbs64]>;
-
-def : Proc<"v4", [FeatureDynamicFrames, FeatureDisableLddw,
-                  FeatureNewMemEncoding, FeatureCallxRegDst, FeaturePqrInstr, FeatureExplicitSext,
-                  FeatureDisableNeg, FeatureReverseSubImm, ALU32, FeatureStaticSyscalls, FeatureRelocAbs64,
-                  FeatureAbiV2]>;
+def : Proc<"v3", [ALU32, FeatureStaticSyscalls, FeatureRelocAbs64, FeatureJmp32,
+                  FeatureDynamicFramesV3, FeatureCallxRegDst]>;
+
+def : Proc<"v4", [ALU32, FeatureStaticSyscalls, FeatureRelocAbs64, FeatureJmp32,
+                  FeatureDynamicFramesV3, FeatureCallxRegDst]>;

llvm/test/CodeGen/SBF/32-bit-subreg-alu.ll

@@ -1,5 +1,5 @@
 ; RUN: llc -O2 -march=sbf -mattr=+alu32 < %s | FileCheck --check-prefixes=CHECK,CHECK-V0 %s
-; RUN: llc -O2 -march=sbf -mcpu=v3 < %s | FileCheck --check-prefixes=CHECK,CHECK-V3 %s
+; RUN: llc -O2 -march=sbf -mcpu=v2 < %s | FileCheck --check-prefixes=CHECK,CHECK-V3 %s
 ;
 ; int mov(int a)
 ; {

llvm/test/CodeGen/SBF/CORE/simplifypatable-nullptr.ll

@@ -1,4 +1,4 @@
-; RUN: llc -sbf-enable-btf-emission -O2 -march=sbf -mcpu=v3 < %s | FileCheck %s
+; RUN: llc -sbf-enable-btf-emission -O2 -march=sbf -mcpu=v2 < %s | FileCheck %s
 ; Source code:
 ;   struct t3 {
 ;     int i;

llvm/test/CodeGen/SBF/objdump_trivial.ll

@@ -1,6 +1,6 @@
 ; RUN: llc -march=sbf -mcpu=v3 -filetype=obj -o - %s | llvm-objdump -d - | FileCheck %s
 
-; CHECK: jslt r1, 0x0,
+; CHECK: jslt32 w1, 0x0,
 ; CHECK: call 0x1
 ; CHECK: exit
 ; CHECK: call 0x2

llvm/test/CodeGen/SBF/unreachable_return.ll

@@ -5,7 +5,7 @@ declare void @dummy_func(i8, ptr, ptr, ptr, ptr, ptr, ptr)
 
 define internal fastcc void @test_func(ptr %0, ptr %1, ptr %args, ptr %2) {
 start:
-; CHECK: add64 r10, -64
+; CHECK-NOT: add64 r10, -64
   %right = alloca [8 x i8], align 8
   %left = alloca [8 x i8], align 8
   store ptr %0, ptr %left, align 8