Skip to content

[SM6.10] Add dx.types.MatrixRef to DXIL #8027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
V-FEXrt merged 2 commits into from
Jan 6, 2026
+139 −151
Merged

[SM6.10] Add dx.types.MatrixRef to DXIL #8027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b879d5
[SM6.10] Add dx.types.MatrixRef to DXIL
V-FEXrt Dec 23, 2025
b388016
format
V-FEXrt Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions include/dxc/DXIL/DxilInstructions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10539,12 +10539,12 @@ struct DxilInst_FillMatrix {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
Copy link
Collaborator

@bob80905 bob80905 Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand you've changed the underlying type from i32 to matrixref, a new dxil type.
But why should these names change from matrixref to matrix?
Wouldn't it be better to leave the function/variable names as is, they are accurate no?

Copy link
Collaborator Author

@V-FEXrt V-FEXrt Dec 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No real technical reason, just a style sense/gut feeling I guess?

the signature @dx.op.createMatrix(MatrixRef matrix) looks nicer to me than @dx.op.createMatrix(MatrixRef matrixRef) must I'm happy to revert if anyone strongly disagrees

arg_value = 2,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_value() const { return Instr->getOperand(2); }
void set_value(llvm::Value *val) { Instr->setOperand(2, val); }
};
Expand All @@ -10570,15 +10570,15 @@ struct DxilInst_CopyConvertMatrix {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_destMatrixRef = 1,
arg_srcMatrixRef = 2,
arg_destination = 1,
arg_source = 2,
arg_transpose = 3,
};
// Accessors
llvm::Value *get_destMatrixRef() const { return Instr->getOperand(1); }
void set_destMatrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_srcMatrixRef() const { return Instr->getOperand(2); }
void set_srcMatrixRef(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_destination() const { return Instr->getOperand(1); }
void set_destination(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_source() const { return Instr->getOperand(2); }
void set_source(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_transpose() const { return Instr->getOperand(3); }
void set_transpose(llvm::Value *val) { Instr->setOperand(3, val); }
};
Expand All @@ -10604,15 +10604,15 @@ struct DxilInst_MatrixLoadFromDescriptor {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_handle = 2,
arg_offset = 3,
arg_stride = 4,
arg_layout = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_handle() const { return Instr->getOperand(2); }
void set_handle(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_offset() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -10643,15 +10643,15 @@ struct DxilInst_MatrixLoadFromMemory {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_groupsharedArr = 2,
arg_offset = 3,
arg_stride = 4,
arg_layout = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_groupsharedArr() const { return Instr->getOperand(2); }
void set_groupsharedArr(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_offset() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -10683,11 +10683,11 @@ struct DxilInst_MatrixLength {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
};

/// This instruction returns a two element vector containing the column and row
Expand All @@ -10711,12 +10711,12 @@ struct DxilInst_MatrixGetCoordinate {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_threadLocalIndex = 2,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_threadLocalIndex() const { return Instr->getOperand(2); }
void set_threadLocalIndex(llvm::Value *val) { Instr->setOperand(2, val); }
};
Expand All @@ -10742,12 +10742,12 @@ struct DxilInst_MatrixGetElement {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_threadLocalIndex = 2,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_threadLocalIndex() const { return Instr->getOperand(2); }
void set_threadLocalIndex(llvm::Value *val) { Instr->setOperand(2, val); }
};
Expand All @@ -10773,13 +10773,13 @@ struct DxilInst_MatrixSetElement {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_threadLocalIndex = 2,
arg_value = 3,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_threadLocalIndex() const { return Instr->getOperand(2); }
void set_threadLocalIndex(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_value() const { return Instr->getOperand(3); }
Expand All @@ -10806,15 +10806,15 @@ struct DxilInst_MatrixStoreToDescriptor {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_handle = 2,
arg_offset = 3,
arg_stride = 4,
arg_layout = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_handle() const { return Instr->getOperand(2); }
void set_handle(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_offset() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -10845,15 +10845,15 @@ struct DxilInst_MatrixStoreToMemory {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_groupsharedArr = 2,
arg_offset = 3,
arg_stride = 4,
arg_layout = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_groupsharedArr() const { return Instr->getOperand(2); }
void set_groupsharedArr(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_offset() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -10906,17 +10906,17 @@ struct DxilInst_MatrixMulOp {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRefA = 1,
arg_matrixRefB = 2,
arg_matrixRefC = 3,
arg_matrixA = 1,
arg_matrixB = 2,
arg_matrixC = 3,
};
// Accessors
llvm::Value *get_matrixRefA() const { return Instr->getOperand(1); }
void set_matrixRefA(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrixRefB() const { return Instr->getOperand(2); }
void set_matrixRefB(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_matrixRefC() const { return Instr->getOperand(3); }
void set_matrixRefC(llvm::Value *val) { Instr->setOperand(3, val); }
llvm::Value *get_matrixA() const { return Instr->getOperand(1); }
void set_matrixA(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrixB() const { return Instr->getOperand(2); }
void set_matrixB(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_matrixC() const { return Instr->getOperand(3); }
void set_matrixC(llvm::Value *val) { Instr->setOperand(3, val); }
};

/// This instruction accumulate A or B matrix into Accumulator matrix following
Expand All @@ -10940,14 +10940,14 @@ struct DxilInst_MatrixAccumulate {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRefRHS = 1,
arg_matrixRefLHS = 2,
arg_matrixRHS = 1,
arg_matrixLHS = 2,
};
// Accessors
llvm::Value *get_matrixRefRHS() const { return Instr->getOperand(1); }
void set_matrixRefRHS(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrixRefLHS() const { return Instr->getOperand(2); }
void set_matrixRefLHS(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_matrixRHS() const { return Instr->getOperand(1); }
void set_matrixRHS(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrixLHS() const { return Instr->getOperand(2); }
void set_matrixLHS(llvm::Value *val) { Instr->setOperand(2, val); }
};

/// This instruction Multiplies a MxK dimension matrix and a K sized input
Expand All @@ -10971,13 +10971,13 @@ struct DxilInst_MatrixVecMul {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_inputVector = 2,
arg_interpretation = 3,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_inputVector() const { return Instr->getOperand(2); }
void set_inputVector(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_interpretation() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -11005,15 +11005,15 @@ struct DxilInst_MatrixVecMulAdd {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_inputVector = 2,
arg_inputInterpretation = 3,
arg_biasVector = 4,
arg_biasInterpretation = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_inputVector() const { return Instr->getOperand(2); }
void set_inputVector(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_inputInterpretation() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -11045,15 +11045,15 @@ struct DxilInst_MatrixAccumulateToDescriptor {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_handle = 2,
arg_offset = 3,
arg_stride = 4,
arg_layout = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_handle() const { return Instr->getOperand(2); }
void set_handle(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_offset() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -11085,15 +11085,15 @@ struct DxilInst_MatrixAccumulateToMemory {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_groupsharedArr = 2,
arg_offset = 3,
arg_stride = 4,
arg_layout = 5,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_groupsharedArr() const { return Instr->getOperand(2); }
void set_groupsharedArr(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_offset() const { return Instr->getOperand(3); }
Expand Down Expand Up @@ -11125,13 +11125,13 @@ struct DxilInst_MatrixOuterProduct {
bool requiresUniformInputs() const { return false; }
// Operand indexes
enum OperandIdx {
arg_matrixRef = 1,
arg_matrix = 1,
arg_vectorA = 2,
arg_vectorB = 3,
};
// Accessors
llvm::Value *get_matrixRef() const { return Instr->getOperand(1); }
void set_matrixRef(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_matrix() const { return Instr->getOperand(1); }
void set_matrix(llvm::Value *val) { Instr->setOperand(1, val); }
llvm::Value *get_vectorA() const { return Instr->getOperand(2); }
void set_vectorA(llvm::Value *val) { Instr->setOperand(2, val); }
llvm::Value *get_vectorB() const { return Instr->getOperand(3); }
Expand Down
2 changes: 2 additions & 0 deletions include/dxc/DXIL/DxilOperations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class OP {
llvm::LLVMContext &GetCtx() { return m_Ctx; }
llvm::Module *GetModule() { return m_pModule; }
llvm::Type *GetHandleType() const;
llvm::Type *GetMatrixRefType() const;
llvm::Type *GetHitObjectType() const;
llvm::Type *GetNodeHandleType() const;
llvm::Type *GetNodeRecordHandleType() const;
Expand Down Expand Up @@ -190,6 +191,7 @@ class OP {
llvm::Type *m_pSplitDoubleType;
llvm::Type *m_pFourI32Type;
llvm::Type *m_pFourI16Type;
llvm::Type *m_pMatrixRefType;

DXIL::LowPrecisionMode m_LowPrecisionMode;

Expand Down
2 changes: 2 additions & 0 deletions include/dxc/DXIL/DxilUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ bool IsHLSLObjectType(llvm::Type *Ty);
bool IsHLSLRayQueryType(llvm::Type *Ty);
llvm::Type *GetHLSLHitObjectType(llvm::Module *M);
bool IsHLSLHitObjectType(llvm::Type *Ty);
llvm::Type *GetHLSLMatrixRefType(llvm::Module *M);
bool IsHLSLMatrixRefType(llvm::Type *Ty);
bool IsHLSLResourceDescType(llvm::Type *Ty);
bool IsResourceSingleComponent(llvm::Type *Ty);
uint8_t GetResourceComponentCount(llvm::Type *Ty);
Expand Down
Loading