Add PUSHPOW2, PUSHPOW2DEC, PUSHNEGPOW2

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## Version: 7.7.34
+
+### New
+
+
+

llvm/CMakeLists.txt

@@ -30,10 +30,10 @@ if(NOT DEFINED LLVM_VERSION_MAJOR)
   set(LLVM_VERSION_MAJOR 7)
 endif()
 if(NOT DEFINED LLVM_VERSION_MINOR)
-  set(LLVM_VERSION_MINOR 0)
+  set(LLVM_VERSION_MINOR 7)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
-  set(LLVM_VERSION_PATCH 0)
+  set(LLVM_VERSION_PATCH 34)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
   set(LLVM_VERSION_SUFFIX "")

llvm/lib/Target/TVM/TVMInstrInfo.td

@@ -268,6 +268,18 @@ defm CONST_U257 : I<(outs I257:$res), (ins UImm257:$uimm),
                     (outs), (ins UImm257:$uimm),
                     [(set I257:$res, (TVMconst_u257 timm:$uimm))],
                     "PUSHINT\t$res, $uimm", "PUSHINT\t$uimm", 0x82>;
+defm CONST_POW2 : I<(outs I257:$res), (ins i257imm:$imm),
+                    (outs), (ins i257imm:$imm),
+                    [(set I257:$res, imm:$imm)],
+                    "PUSHPOW2\t$res, $imm", "PUSHPOW2\t$imm", 0x83>;
+defm CONST_POW2DEC : I<(outs I257:$res), (ins i257imm:$imm),
+                      (outs), (ins i257imm:$imm),
+                      [(set I257:$res, imm:$imm)],
+                       "PUSHPOW2DEC\t$res, $imm", "PUSHPOW2DEC\t$imm", 0x84>;
+defm CONST_NEGPOW2 : I<(outs I257:$res), (ins i257imm:$imm),
+                       (outs), (ins i257imm:$imm),
+                       [(set I257:$res, imm:$imm)],
+                       "PUSHNEGPOW2\t$res, $imm", "PUSHNEGPOW2\t$imm", 0x85>;
 }
 
 

llvm/lib/Target/TVM/TVMPeephole.cpp

@@ -45,6 +45,11 @@ static cl::opt<bool> DisableTVMShorterFormOpt(
     "disable-tvm-shorter-form-opt", cl::Hidden,
     cl::desc("TVM: Disable shorter form replacement peephole optimizations."),
     cl::init(false));
+static cl::opt<bool> DisableTVMPushintOpt(
+    "disable-tvm-pushint-opt", cl::Hidden,
+    cl::desc("TVM: Disable power of 2 optimizations for constants."),
+    cl::init(false));
+
 static unsigned BlkPushLimit = 15;
 namespace {
 class TVMPeephole final : public MachineFunctionPass {
@@ -64,6 +69,7 @@ class TVMPeephole final : public MachineFunctionPass {
   bool runBlkPushCombine(MachineBasicBlock &MBB, const TargetInstrInfo &TII);
   bool runReplaceWithShorterForm(MachineBasicBlock &MBB,
                                  const TargetInstrInfo &TII);
+  bool runPushintOpt(MachineBasicBlock &MBB, const TargetInstrInfo &TII);
   bool runMbbInlineOptimization(MachineBasicBlock &MBB,
                                 const TargetInstrInfo &TII);
   bool runIfElseOptimization(MachineBasicBlock &MBB,
@@ -220,6 +226,39 @@ bool TVMPeephole::runReplaceWithShorterForm(MachineBasicBlock &MBB,
   return !MIReplace.empty();
 }
 
+bool TVMPeephole::runPushintOpt(MachineBasicBlock &MBB,
+                                const TargetInstrInfo &TII) {
+  std::vector<MachineInstr *> MIRemove;
+  for (auto &I : MBB) {
+    if (I.getOpcode() != TVM::CONST_I257_S && I.getOpcode() != TVM::CONST_U257_S)
+      continue;
+    APInt Val = I.getOperand(0).getCImm()->getValue();
+    if (Val.isPowerOf2() && Val.ugt(64)) {
+      MIRemove.push_back(&I);
+      BuildMI(&I, TII.get(TVM::CONST_POW2_S))
+        .addImm(Val.getBitWidth() - Val.countLeadingZeros() - 1);
+      continue;
+    }
+    APInt AbsVal = Val.abs();
+    if (AbsVal.isPowerOf2() && AbsVal.ugt(64)) {
+      MIRemove.push_back(&I);
+      BuildMI(&I, TII.get(TVM::CONST_NEGPOW2_S))
+        .addImm(AbsVal.getBitWidth() - AbsVal.countLeadingZeros() - 1);
+      continue;
+    }
+    Val += 1;
+    if (Val.isPowerOf2() && Val.ugt(64)) {
+      MIRemove.push_back(&I);
+      BuildMI(&I, TII.get(TVM::CONST_POW2DEC_S))
+        .addImm(Val.getBitWidth() - Val.countLeadingZeros() - 1);
+      continue;
+    }
+  }
+  for (auto *I : MIRemove)
+    I->eraseFromParent();
+  return !MIRemove.empty();
+}
+
 bool TVMPeephole::runImplicitReturnOptimization(MachineBasicBlock &MBB,
                                                 const TargetInstrInfo &TII) {
   if (MBB.empty())
@@ -602,6 +641,8 @@ bool TVMPeephole::runOnMachineBasicBlock(MachineBasicBlock &MBB,
     Changed |= runBlkPushCombine(MBB, TII);
   if (!DisableTVMShorterFormOpt)
     Changed |= runReplaceWithShorterForm(MBB, TII);
+  if (!DisableTVMPushintOpt)
+    Changed |= runPushintOpt(MBB, TII);
 
   return Changed;
 }

llvm/test/CodeGen/TVM/frameidx-codegen.ll

@@ -28,7 +28,7 @@ define i257 @small() {
 ; CHECK-NEXT:  ADDCONST 127
 ; CHECK-NEXT:  GETGLOB 13 CALLX
 ; CHECK-NEXT:  GETGLOB 5
-; CHECK-NEXT:  PUSHINT 128
+; CHECK-NEXT:  PUSHPOW2 7
 ; CHECK-NEXT:  ADD
 ; CHECK-NEXT:  SETGLOB 5
 entry:
@@ -45,7 +45,7 @@ define i257 @large() {
 ; CHECK-NEXT:  SUB
 ; CHECK-NEXT:  SETGLOB 5
 ; CHECK-NEXT:  GETGLOB 5
-; CHECK-NEXT:  PUSHINT 128
+; CHECK-NEXT:  PUSHPOW2 7
 ; CHECK-NEXT:  ADD
 ; CHECK-NEXT:  GETGLOB 13 CALLX
 ; CHECK-NEXT:  GETGLOB 5

llvm/test/CodeGen/TVM/optimizations/pow2.ll

@@ -0,0 +1,26 @@
+; RUN: llc -O3 < %s -march=tvm -filetype=asm | FileCheck %s
+target datalayout = "E-S257-i1:257:257-i8:257:257-i16:257:257-i32:257:257-i64:257:257-i257:257:257-p:257:257-a:257:257"
+target triple = "tvm"
+
+; CHECK-LABEL: ret1
+define i257 @ret1() {
+; CHECK: PUSHPOW2 7
+  ret i257 128
+}
+
+; CHECK-LABEL: ret2
+define i257 @ret2() {
+; CHECK: PUSHNEGPOW2 8
+  ret i257 -256
+}
+
+; CHECK-LABEL: ret3
+define i257 @ret3() {
+; CHECK: PUSHPOW2DEC	8
+  ret i257 255
+}
+
+; CHECK-LABEL: retneg
+define i257 @retneg() {
+  ret i257 0
+}

llvm/test/CodeGen/TVM/primitives/addconst_pos_range_over.ll

@@ -4,7 +4,7 @@ target triple = "tvm"
 
 define i257 @addconst_pos_range_over(i257 %a1) nounwind {
 ; CHECK-LABEL: addconst_pos_range_over:
-; CHECK: PUSHINT
+; CHECK: PUSHPOW2
 ; CHECK-NEXT: ADD 
  %1 = add i257 128, %a1
  ret i257 %1

llvm/test/CodeGen/TVM/select-isel.ll

@@ -5,7 +5,7 @@ target triple = "tvm"
 define i257 @foo(i257 %x) {
 entry:
 ; CHECK-LABEL: foo
-; CHECK:      PUSHINT -0x10000000000000000000000000000000000000000000000000000000000000000
+; CHECK:      PUSHPOW2
 ; CHECK-NEXT: EQUAL
 ; CHECK-NEXT: PUSHINT 7
 ; CHECK-NEXT: PUSHINT 13