Remove commented-out code; add integer/literal test

Author: cassiebeckley

llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp

@@ -2919,8 +2919,6 @@ static SPIRVType *getInlineSpirvType(const TargetExtType *ExtensionType,
         }
         return Instr;
       });
-
-  // GR->getOrCreateSPIRVArrayType();
 }
 
 namespace SPIRV {

llvm/test/CodeGen/SPIRV/inline/type.ll

@@ -7,8 +7,8 @@
 ; CHECK: [[image_t:%[0-9]+]] = OpTypeImage %3 2D 2 0 0 1 Unknown
 %type_2d_image = type target("spirv.Image", float, 1, 2, 0, 0, 1, 0)
 
-%literal_false = type target("spirv.Literal", 0)
-%literal_8 = type target("spirv.Literal", 8)
+%literal_true = type target("spirv.Literal", 1)
+%literal_32 = type target("spirv.Literal", 32)
 
 ; CHECK: [[uint32_4:%[0-9]+]] = OpConstant [[uint32_t]] 4
 %integral_constant_4 = type target("spirv.IntegralConstant", i32, 4)
@@ -18,15 +18,26 @@
 
 ; CHECK: [[getTexArray_t:%[0-9]+]] = OpTypeFunction [[array_t]]
 
+; CHECK: !0x40015 [[int_t:%[0-9]+]] 32 1
+%int_t = type target("spirv.Type", %literal_32, %literal_true, 21, 0, 0)
+
+; CHECK: [[getInt_t:%[0-9]+]] = OpTypeFunction [[int_t]]
+
 ; CHECK: [[getTexArray:%[0-9]+]] = OpFunction [[array_t]] None [[getTexArray_t]]
 declare %ArrayTex2D @getTexArray()
 
+; CHECK: [[getInt:%[0-9]+]] = OpFunction [[int_t]] None [[getInt_t]]
+declare %int_t @getInt()
+
 define void @main() #1 {
 entry:
   %images = alloca %ArrayTex2D
 
 ; CHECK: {{%[0-9]+}} = OpFunctionCall [[array_t]] [[getTexArray]]
   %retTex = call %ArrayTex2D @getTexArray()
 
+; CHECK: {{%[0-9]+}} = OpFunctionCall [[int_t]] [[getInt]]
+  %i = call %int_t @getInt()
+
   ret void
 }