allow non i32 imm values

Author: farzonl

llvm/lib/Target/DirectX/DXILLegalizePass.cpp

@@ -48,10 +48,14 @@ static bool fixI8TruncUseChain(Instruction &I,
     Type *InstrType = IntegerType::get(I.getContext(), 32);
     for (unsigned OpIdx = 0; OpIdx < I.getNumOperands(); ++OpIdx) {
       Value *Op = I.getOperand(OpIdx);
-      if (ReplacedValues.count(Op)) {
+      if (ReplacedValues.count(Op))
         InstrType = ReplacedValues[Op]->getType();
+    }
+    for (unsigned OpIdx = 0; OpIdx < I.getNumOperands(); ++OpIdx) {
+      Value *Op = I.getOperand(OpIdx);
+      if (ReplacedValues.count(Op))
         NewOperands.push_back(ReplacedValues[Op]);
-      } else if (auto *Imm = dyn_cast<ConstantInt>(Op)) {
+      else if (auto *Imm = dyn_cast<ConstantInt>(Op)) {
         APInt Value = Imm->getValue();
         unsigned NewBitWidth = InstrType->getIntegerBitWidth();
         // Note: options here are sext or sextOrTrunc.
@@ -142,7 +146,7 @@ class DXILLegalizationPipeline {
     bool MadeChanges = false;
     for (auto &I : instructions(F)) {
       for (auto &LegalizationFn : LegalizationPipeline) {
-        MadeChanges = LegalizationFn(I, ToRemove, ReplacedValues);
+        MadeChanges |= LegalizationFn(I, ToRemove, ReplacedValues);
       }
     }
     while (!ToRemove.empty()) {

llvm/test/CodeGen/DirectX/legalize-i8.ll

@@ -85,3 +85,25 @@ define i32 @first_operand_imm_test(i32 %a) {
   %3 = sext i8 %2 to i32
   ret i32 %3
 }
+
+define i16 @i16_test(i16 %a) {
+  ; CHECK-LABEL: define i16 @i16_test(
+  ; CHECK-SAME: i16 [[A:%.*]]) {
+  ; CHECK-NOT: trunc
+  ; CHECK: sub i16 0, [[A]]
+  ; CHECK-NOT: sext i8
+  %1 = trunc nsw i16 %a to i8
+  %2 = sub i8 0, %1
+  %3 = sext i8 %2 to i16
+  ret i16 %3
+}
+
+define i32 @all_imm() {
+  ; CHECK-LABEL: define i32 @all_imm(
+  ; CHECK-NOT: trunc
+  ; CHECK-NOT: sext i8
+  ; CHECK: ret i32 -1
+  %1 = sub i8 0, 1
+  %2 = sext i8 %1 to i32
+  ret i32 %2
+}