Restore LinalgMatrixLayout to DxilConstants.h instead of local enum

Co-authored-by: damyanp <[email protected]>
Agent-Logs-Url: https://github.com/damyanp/DirectXShaderCompiler/sessions/4d3d86d1-1c56-4d1f-a553-bf8c37a74c84

Author: Copilot

include/dxc/DXIL/DxilConstants.h

@@ -204,6 +204,13 @@ enum class MatrixScope : uint32_t {
   ThreadGroup = 2,
 };
 
+enum class LinalgMatrixLayout : uint32_t {
+  RowMajor = 0,
+  ColumnMajor = 1,
+  MulOptimal = 2,
+  OuterProductOptimal = 3,
+};
+
 // Must match D3D_INTERPOLATION_MODE
 enum class InterpolationMode : uint8_t {
   Undefined = 0,

tools/clang/unittests/HLSLExec/LinAlgTests.cpp

@@ -32,11 +32,10 @@
 namespace LinAlg {
 
 using hlsl::DXIL::ComponentType;
+using hlsl::DXIL::LinalgMatrixLayout;
 using hlsl::DXIL::MatrixScope;
 using hlsl::DXIL::MatrixUse;
 
-enum class MatrixLayout : uint32_t { RowMajor = 0, ColumnMajor = 1 };
-
 /// Return the byte size of a single element for the given component type.
 static int elemSize(ComponentType CT) {
   switch (CT) {
@@ -187,13 +186,13 @@ struct MatrixParams {
   int N;
   MatrixUse Use;
   MatrixScope Scope;
-  MatrixLayout Layout;
+  LinalgMatrixLayout Layout;
   int NumThreads;
   bool Enable16Bit;
 
   int strideBytes() const {
     int ES = elemSize(CompType);
-    if (Layout == MatrixLayout::RowMajor)
+    if (Layout == LinalgMatrixLayout::RowMajor)
       return N * ES;
     return M * ES;
   }
@@ -459,7 +458,7 @@ void DxilConf_SM610_LinAlg::LoadStoreRoundtrip_Wave_F32() {
   Params.N = 8;
   Params.Use = MatrixUse::A;
   Params.Scope = MatrixScope::Wave;
-  Params.Layout = MatrixLayout::RowMajor;
+  Params.Layout = LinalgMatrixLayout::RowMajor;
   Params.NumThreads = 64;
   Params.Enable16Bit = false;
   runLoadStoreRoundtrip(D3DDevice, DxcSupport, Params, VerboseLogging);
@@ -472,7 +471,7 @@ void DxilConf_SM610_LinAlg::LoadStoreRoundtrip_Wave_I32() {
   Params.N = 8;
   Params.Use = MatrixUse::A;
   Params.Scope = MatrixScope::Wave;
-  Params.Layout = MatrixLayout::RowMajor;
+  Params.Layout = LinalgMatrixLayout::RowMajor;
   Params.NumThreads = 64;
   Params.Enable16Bit = false;
   runLoadStoreRoundtrip(D3DDevice, DxcSupport, Params, VerboseLogging);
@@ -563,7 +562,7 @@ void DxilConf_SM610_LinAlg::SplatStore_Wave_F32() {
   Params.N = 8;
   Params.Use = MatrixUse::Accumulator;
   Params.Scope = MatrixScope::Wave;
-  Params.Layout = MatrixLayout::RowMajor;
+  Params.Layout = LinalgMatrixLayout::RowMajor;
   Params.NumThreads = 64;
   Params.Enable16Bit = false;
   runSplatStore(D3DDevice, DxcSupport, Params, 42.0f, VerboseLogging);
@@ -576,7 +575,7 @@ void DxilConf_SM610_LinAlg::SplatStore_Wave_I32() {
   Params.N = 8;
   Params.Use = MatrixUse::Accumulator;
   Params.Scope = MatrixScope::Wave;
-  Params.Layout = MatrixLayout::RowMajor;
+  Params.Layout = LinalgMatrixLayout::RowMajor;
   Params.NumThreads = 64;
   Params.Enable16Bit = false;
   runSplatStore(D3DDevice, DxcSupport, Params, 7.0f, VerboseLogging);