Respond to feedback

Remove some unneeded parts of IR tests. Add some back. I discovered that
the pauseresume line is at least sometimes needed to construct the
module with the shader model information. I fear some of the tests were
passing before becuase they expected no changes, but were operating in
non-6.9 mode. So they passed, but for the wrong reason.

Remove unused DM param to matrixbitcastlowerpass lower matrix call.

reword confusing dynindexingvectortoarray comment

Author: Greg Roth

lib/HLSL/HLMatrixBitcastLowerPass.cpp

@@ -116,13 +116,13 @@ class MatrixBitcastLowerPass : public FunctionPass {
 
     // Lower matrix first.
     for (BitCastInst *BCI : matCastSet) {
-      lowerMatrix(DM, BCI, BCI->getOperand(0));
+      lowerMatrix(BCI, BCI->getOperand(0));
     }
     return bUpdated;
   }
 
 private:
-  void lowerMatrix(DxilModule &DM, Instruction *M, Value *A);
+  void lowerMatrix(Instruction *M, Value *A);
   bool hasCallUser(Instruction *M);
 };
 
@@ -183,8 +183,7 @@ Value *CreateEltGEP(Value *A, unsigned i, Value *zeroIdx,
 }
 } // namespace
 
-void MatrixBitcastLowerPass::lowerMatrix(DxilModule &DM, Instruction *M,
-                                         Value *A) {
+void MatrixBitcastLowerPass::lowerMatrix(Instruction *M, Value *A) {
   for (auto it = M->user_begin(); it != M->user_end();) {
     User *U = *(it++);
     if (GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(U)) {
@@ -203,14 +202,14 @@ void MatrixBitcastLowerPass::lowerMatrix(DxilModule &DM, Instruction *M,
           idxList.back() = Builder.CreateMul(idxList.back(), MatSize);
         }
         Value *NewGEP = Builder.CreateGEP(A, idxList);
-        lowerMatrix(DM, GEP, NewGEP);
+        lowerMatrix(GEP, NewGEP);
         DXASSERT(GEP->user_empty(), "else lower matrix fail");
         GEP->eraseFromParent();
       } else {
         DXASSERT(0, "invalid GEP for matrix");
       }
     } else if (BitCastInst *BCI = dyn_cast<BitCastInst>(U)) {
-      lowerMatrix(DM, BCI, A);
+      lowerMatrix(BCI, A);
       DXASSERT(BCI->user_empty(), "else lower matrix fail");
       BCI->eraseFromParent();
     } else if (LoadInst *LI = dyn_cast<LoadInst>(U)) {

lib/Transforms/Scalar/LowerTypePasses.cpp

@@ -216,10 +216,11 @@ void DynamicIndexingVectorToArray::initialize(Module &M) {
   //  - From standard compile before dxilgen.
   //  - When linking, where dxmodule is available.
   //  - In isolated dxopt, where the module will need to be created.
-  // Since HL module can't be created when linking, check for that first.
+  // When linking, we expect a dxil module and can't create an HL module,
+  //  so we try for the dxil module first.
   // Otherwise, either retrieve or generate the HL module.
   if (M.HasDxilModule()) {
-    SupportsVectors = M.GetDxilModule().GetShaderModel()->IsSM69Plus();
+    SupportsVectors = M.GetOrCreateDxilModule().GetShaderModel()->IsSM69Plus();
   } else {
     HLModule &HLM = M.GetOrCreateHLModule();
     SupportsVectors = HLM.GetShaderModel()->IsSM69Plus();

tools/clang/test/CodeGenDXIL/passes/longvec-alloca-gv-dynvec2array.ll

@@ -74,7 +74,7 @@ bb:
   %stloc1 = alloca <1 x float>, align 4
   %stloc2 = alloca <2 x float>, align 4
   %stlar2 = alloca [4 x <2 x float>], align 4
-  store i32 %ix, i32* %tmp, align 4, !tbaa !22
+  store i32 %ix, i32* %tmp, align 4
 
   %tmp13 = load i32, i32* %tmp, align 4 ; line:53 col:7
   %tmp14 = icmp sgt i32 %tmp13, 0 ; line:53 col:10
@@ -265,6 +265,7 @@ bb76:                                             ; preds = %bb17, %bb
 
 attributes #0 = { nounwind }
 
+!pauseresume = !{!1}
 !dx.version = !{!3}
 !dx.valver = !{!3}
 !dx.shaderModel = !{!4}
@@ -273,9 +274,7 @@ attributes #0 = { nounwind }
 !dx.fnprops = !{}
 !dx.options = !{!20, !21}
 
-!0 = !{i32 2, !"Debug Info Version", i32 3}
 !1 = !{!"hlsl-hlemit", !"hlsl-hlensure"}
-!2 = !{!"dxc(private) 1.8.0.4845 (disable_disble_spirv, 2514104b9-dirty)"}
 !3 = !{i32 1, i32 9}
 !4 = !{!"lib", i32 6, i32 9}
 !5 = !{i32 0, %struct.VectRec1 undef, !6, %struct.VectRec2 undef, !8}
@@ -295,10 +294,3 @@ attributes #0 = { nounwind }
 !19 = !{null, !"", null, null, null}
 !20 = !{i32 64}
 !21 = !{i32 -1}
-!22 = !{!23, !23, i64 0}
-!23 = !{!"int", !24, i64 0}
-!24 = !{!"omnipotent char", !25, i64 0}
-!25 = !{!"Simple C/C++ TBAA"}
-!44 = !{!45, !45, i64 0}
-!45 = !{!"float", !24, i64 0}
-!148 = !{!24, !24, i64 0}

tools/clang/test/CodeGenDXIL/passes/longvec-alloca-gv-sroa.ll

@@ -82,7 +82,7 @@ bb:
   %stlorc1 = alloca %struct.VectRec1, align 4
   %stlorc2 = alloca %struct.VectRec2, align 4
 
-  store i32 %ix, i32* %tmp, align 4, !tbaa !25
+  store i32 %ix, i32* %tmp, align 4
   %tmp13 = load i32, i32* %tmp, align 4 ; line:53 col:7
   %tmp14 = icmp sgt i32 %tmp13, 0 ; line:53 col:10
   %tmp15 = icmp ne i1 %tmp14, false ; line:53 col:10
@@ -286,6 +286,7 @@ bb86:                                             ; preds = %bb17, %bb
 
 attributes #0 = { nounwind }
 
+!pauseresume = !{!1}
 !dx.version = !{!3}
 !dx.valver = !{!3}
 !dx.shaderModel = !{!4}
@@ -294,9 +295,7 @@ attributes #0 = { nounwind }
 !dx.fnprops = !{}
 !dx.options = !{!23, !24}
 
-!0 = !{i32 2, !"Debug Info Version", i32 3}
 !1 = !{!"hlsl-hlemit", !"hlsl-hlensure"}
-!2 = !{!"dxc(private) 1.8.0.4845 (disable_disble_spirv, 2514104b9-dirty)"}
 !3 = !{i32 1, i32 9}
 !4 = !{!"lib", i32 6, i32 9}
 !5 = !{i32 0, %struct.VectRec1 undef, !6, %struct.VectRec2 undef, !8}
@@ -323,6 +322,3 @@ attributes #0 = { nounwind }
 !26 = !{!"int", !27, i64 0}
 !27 = !{!"omnipotent char", !28, i64 0}
 !28 = !{!"Simple C/C++ TBAA"}
-!47 = !{!48, !48, i64 0}
-!48 = !{!"float", !27, i64 0}
-!155 = !{!27, !27, i64 0}

tools/clang/test/CodeGenDXIL/passes/longvec-operators-scalarizer.ll

@@ -655,19 +655,15 @@ attributes #0 = { nounwind }
 attributes #1 = { nounwind readonly }
 attributes #2 = { nounwind readnone }
 
-!llvm.module.flags = !{!0}
 !pauseresume = !{!1}
-!llvm.ident = !{!2}
 !dx.version = !{!3}
 !dx.valver = !{!3}
 !dx.shaderModel = !{!4}
 !dx.resources = !{!5}
 !dx.typeAnnotations = !{!9, !15}
 !dx.entryPoints = !{!35}
 
-!0 = !{i32 2, !"Debug Info Version", i32 3}
 !1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-!2 = !{!"dxc(private) 1.8.0.4845 (disable_disble_spirv, 2514104b9-dirty)"}
 !3 = !{i32 1, i32 9}
 !4 = !{!"lib", i32 6, i32 9}
 !5 = !{null, !6, null, null}

tools/clang/test/CodeGenDXIL/passes/longvec-operators-vec1-scalarizer.ll

@@ -741,16 +741,15 @@ attributes #0 = { nounwind }
 attributes #1 = { nounwind readnone }
 attributes #2 = { nounwind readonly }
 
+!pauseresume = !{!1}
 !dx.version = !{!3}
 !dx.valver = !{!3}
 !dx.shaderModel = !{!4}
 !dx.resources = !{!5}
 !dx.typeAnnotations = !{!9, !15}
 !dx.entryPoints = !{!35}
 
-!0 = !{i32 2, !"Debug Info Version", i32 3}
 !1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-!2 = !{!"dxc(private) 1.8.0.4807 (longvec_bab_ldst, 88cfe61c3-dirty)"}
 !3 = !{i32 1, i32 9}
 !4 = !{!"lib", i32 6, i32 9}
 !5 = !{null, !6, null, null}

tools/clang/test/HLSLFileCheck/passes/dxil/lower_type/vec_array_param.ll

@@ -31,6 +31,7 @@ declare float @"\01?foo@@YAMY02V?$vector@M$02@@@Z"([3 x <3 x float>]*)
 
 attributes #0 = { nounwind }
 
+!pauseresume = !{!1}
 !dx.version = !{!3}
 !dx.valver = !{!4}
 !dx.shaderModel = !{!5}
@@ -39,7 +40,6 @@ attributes #0 = { nounwind }
 !dx.fnprops = !{}
 !dx.options = !{!13, !14}
 
-!0 = !{i32 2, !"Debug Info Version", i32 3}
 !1 = !{!"hlsl-hlemit", !"hlsl-hlensure"}
 !3 = !{i32 1, i32 6}
 !4 = !{i32 1, i32 6}