Simlify matrix layout check and fix typo in validation message matrix layout -> matrix stride

Author: anupamachandra

docs/DXIL.rst

@@ -3145,7 +3145,7 @@ INSTR.LINALGINVALIDMEMORYINTERPVALUE                          In Memory Interpol
 INSTR.LINALGINVALIDREGISTERINTERPVALUE                        From Register Interpretation value must be valid.
 INSTR.LINALGMATRIXLAYOUTNOTTRANSPOSABLE                       Row Major and Column Major matrix layouts are not transposable.
 INSTR.LINALGMATRIXSHAPEPARAMSARECONST                         Matrix Layout, Dimensions and isTranspose are constants
-INSTR.LINALGMATRIXSTRIDEZEROFOROPTIMALLAYOUTS                 Matrix Layout for optimal layouts must be zero
+INSTR.LINALGMATRIXSTRIDEZEROFOROPTIMALLAYOUTS                 For optimal layouts, matrix stride must be zero.
 INSTR.LINALGNOTANUNSIGNEDTYPE                                 Unsigned flag set for a float signed type
 INSTR.MATVECOPISUNSIGNEDFLAGSARECONST                         In Linalg Mul/MulAdd functions, IsUnsigned flag is a constant.
 INSTR.MAYREORDERTHREADUNDEFCOHERENCEHINTPARAM                 Use of undef coherence hint or num coherence hint bits in MaybeReorderThread.

lib/DxilValidation/DxilValidation.cpp

@@ -997,11 +997,6 @@ static bool CheckMatrixLayoutForMatVecMulOps(unsigned Layout) {
          static_cast<unsigned>(DXIL::LinalgMatrixLayout::OuterProductOptimal);
 }
 
-static bool CheckMatrixLayoutForOuterProdAcc(unsigned Layout) {
-  return Layout ==
-         static_cast<unsigned>(DXIL::LinalgMatrixLayout::OuterProductOptimal);
-}
-
 std::string GetMatrixLayoutStr(unsigned Layout) {
   switch (static_cast<DXIL::LinalgMatrixLayout>(Layout)) {
   case DXIL::LinalgMatrixLayout::RowMajor:
@@ -1236,7 +1231,8 @@ static void ValidateImmOperandsForOuterProdAcc(CallInst *CI,
   }
   ConstantInt *ML = cast<ConstantInt>(MatrixLayout);
   uint64_t MLValue = ML->getLimitedValue();
-  if (!CheckMatrixLayoutForOuterProdAcc(MLValue))
+  if (MLValue !=
+      static_cast<unsigned>(DXIL::LinalgMatrixLayout::OuterProductOptimal))
     ValCtx.EmitInstrFormatError(
         CI,
         ValidationRule::

…er-product-accumulate-matrix-layout.hlsl …er-product-accumulate-matrix-layout.hlsltools/clang/test/CodeGenDXIL/hlsl/intrinsics/linalg_builtins/outer-product-accumulate-matrix-layout.hlsl renamed to tools/clang/test/CodeGenHLSL/linalg/outer-product-accumulate-matrix-layout.hlsl tools/clang/test/CodeGenDXIL/hlsl/intrinsics/linalg_builtins/outer-product-accumulate-matrix-layout.hlsl renamed to tools/clang/test/CodeGenHLSL/linalg/outer-product-accumulate-matrix-layout.hlsl

@@ -1,4 +1,3 @@
-
 // RUN: %dxc -T cs_6_9 %s -enable-16bit-types -DML=RowMajor -DSTRIDE=64 2>&1| FileCheck %s --check-prefixes DXIL-0
 // RUN: %dxc -T cs_6_9 %s -enable-16bit-types -DML=ColumnMajor -DSTRIDE=64 2>&1 | FileCheck %s --check-prefixes DXIL-1
 // RUN: %dxc -T cs_6_9 %s -enable-16bit-types -DML=MulOptimal -DSTRIDE=64 2>&1 | FileCheck %s --check-prefixes DXIL-2
@@ -47,7 +46,7 @@ enum MatLayout {
 // DXIL-1: error: matrix layout value 'ColumnMajor' is not valid for outerproductaccumulate, must be 'OuterProductOptimal' 
 // DXIL-2: error: matrix layout value 'MulOptimal' is not valid for outerproductaccumulate, must be 'OuterProductOptimal' 
 // DXIL-3-NOT: error: matrix layout value 'OuterProductOptimal' is not valid for outerproductaccumulate, must be 'OuterProductOptimal' 
-// DXIL-3: error: Matrix Layout for optimal layouts must be zero 
+// DXIL-3: error: matrix stride must be zero for optimal layouts 
 // DXIL-4: call void @dx.op.outerProductAccumulate.v8f16.v8f16(i32 307, <8 x half> %{{[^ ]+}}, <8 x half> %{{[^ ]+}}, %dx.types.Handle %{{[^ ]+}}, i32 0, i32 8, i32 3, i32 0)
 
 [Numthreads(1,1,1)]

utils/hct/hctdb.py

@@ -8447,9 +8447,10 @@ def build_valrules(self):
             "matrix layout value '%0' is not valid. Must be between [%1 - %2]",
         )
 
-        self.add_valrule(
+        self.add_valrule_msg(
             "Instr.LinalgMatrixStrideZeroForOptimalLayouts",
-            "Matrix Layout for optimal layouts must be zero",
+            "For optimal layouts, matrix stride must be zero.",
+            "matrix stride must be zero for optimal layouts",
         )
 
         self.add_valrule_msg(