Skip to content

[SM6.10][specs/769] Remove CreateMatrix from HLOps #8161

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 1 commit into from
Feb 14, 2026
Merged

[SM6.10][specs/769] Remove CreateMatrix from HLOps #8161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 21 additions & 22 deletions include/dxc/HlslIntrinsicOp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum class IntrinsicOp {
IOP_ClusterID = 397,
IOP_CreateResourceFromHeap = 8,
IOP_D3DCOLORtoUBYTE4 = 9,
IOP_DebugBreak = 425,
IOP_DebugBreak = 424,
IOP_DeviceMemoryBarrier = 10,
IOP_DeviceMemoryBarrierWithGroupSync = 11,
IOP_DispatchMesh = 12,
Expand Down Expand Up @@ -113,25 +113,24 @@ enum class IntrinsicOp {
IOP_WorldToObject3x4 = 100,
IOP_WorldToObject4x3 = 101,
IOP___builtin_LinAlg_CopyConvertMatrix = 405,
IOP___builtin_LinAlg_CreateMatrix = 406,
IOP___builtin_LinAlg_FillMatrix = 407,
IOP___builtin_LinAlg_MatrixAccumulate = 416,
IOP___builtin_LinAlg_MatrixAccumulateToDescriptor = 420,
IOP___builtin_LinAlg_MatrixAccumulateToMemory = 421,
IOP___builtin_LinAlg_MatrixGetCoordinate = 408,
IOP___builtin_LinAlg_MatrixGetElement = 409,
IOP___builtin_LinAlg_MatrixLength = 410,
IOP___builtin_LinAlg_MatrixLoadFromDescriptor = 411,
IOP___builtin_LinAlg_MatrixLoadFromMemory = 412,
IOP___builtin_LinAlg_MatrixMatrixMultiply = 417,
IOP___builtin_LinAlg_MatrixMatrixMultiplyAccumulate = 418,
IOP___builtin_LinAlg_MatrixOuterProduct = 422,
IOP___builtin_LinAlg_MatrixQueryAccumulatorLayout = 419,
IOP___builtin_LinAlg_MatrixSetElement = 413,
IOP___builtin_LinAlg_MatrixStoreToDescriptor = 414,
IOP___builtin_LinAlg_MatrixStoreToMemory = 415,
IOP___builtin_LinAlg_MatrixVectorMultiply = 423,
IOP___builtin_LinAlg_MatrixVectorMultiplyAdd = 424,
IOP___builtin_LinAlg_FillMatrix = 406,
IOP___builtin_LinAlg_MatrixAccumulate = 415,
IOP___builtin_LinAlg_MatrixAccumulateToDescriptor = 419,
IOP___builtin_LinAlg_MatrixAccumulateToMemory = 420,
IOP___builtin_LinAlg_MatrixGetCoordinate = 407,
IOP___builtin_LinAlg_MatrixGetElement = 408,
IOP___builtin_LinAlg_MatrixLength = 409,
IOP___builtin_LinAlg_MatrixLoadFromDescriptor = 410,
IOP___builtin_LinAlg_MatrixLoadFromMemory = 411,
IOP___builtin_LinAlg_MatrixMatrixMultiply = 416,
IOP___builtin_LinAlg_MatrixMatrixMultiplyAccumulate = 417,
IOP___builtin_LinAlg_MatrixOuterProduct = 421,
IOP___builtin_LinAlg_MatrixQueryAccumulatorLayout = 418,
IOP___builtin_LinAlg_MatrixSetElement = 412,
IOP___builtin_LinAlg_MatrixStoreToDescriptor = 413,
IOP___builtin_LinAlg_MatrixStoreToMemory = 414,
IOP___builtin_LinAlg_MatrixVectorMultiply = 422,
IOP___builtin_LinAlg_MatrixVectorMultiplyAdd = 423,
IOP___builtin_MatVecMul = 390,
IOP___builtin_MatVecMulAdd = 391,
IOP___builtin_OuterProductAccumulate = 392,
Expand Down Expand Up @@ -400,7 +399,7 @@ enum class IntrinsicOp {
MOP_DxHitObject_SetShaderTableIndex = 388,
MOP_DxHitObject_TraceRay = 389,
MOP_DxHitObject_TriangleObjectPositions = 404,
IOP_DxIsDebuggerPresent = 426,
IOP_DxIsDebuggerPresent = 425,
IOP_DxMaybeReorderThread = 359,
MOP_Count = 328,
MOP_FinishedCrossGroupSharing = 329,
Expand Down Expand Up @@ -433,7 +432,7 @@ enum class IntrinsicOp {
IOP_usign = 355,
MOP_InterlockedUMax = 356,
MOP_InterlockedUMin = 357,
Num_Intrinsics = 427,
Num_Intrinsics = 426,
};
inline bool HasUnsignedIntrinsicOpcode(IntrinsicOp opcode) {
switch (opcode) {
Expand Down
2 changes: 0 additions & 2 deletions lib/HLSL/HLOperationLower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7659,8 +7659,6 @@ constexpr IntrinsicLower gLowerTable[] = {

{IntrinsicOp::IOP___builtin_LinAlg_CopyConvertMatrix, EmptyLower,
DXIL::OpCode::CopyConvertMatrix},
{IntrinsicOp::IOP___builtin_LinAlg_CreateMatrix, EmptyLower,
DXIL::OpCode::CreateMatrix},
{IntrinsicOp::IOP___builtin_LinAlg_FillMatrix, EmptyLower,
DXIL::OpCode::FillMatrix},
{IntrinsicOp::IOP___builtin_LinAlg_MatrixGetCoordinate, EmptyLower,
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/DXC/Passes/DxilGen/debugbreak.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ entry:
br i1 %cmp, label %if.then, label %if.end

if.then:
call void @"dx.hl.op..void (i32)"(i32 425)
call void @"dx.hl.op..void (i32)"(i32 424)
br label %if.end

if.end:
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/DXC/Passes/DxilGen/isdebuggerpresent.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target triple = "dxil-ms-dx"
; Function Attrs: nounwind
define void @main(<3 x i32> %threadId) #0 {
entry:
%0 = call i1 @"dx.hl.op.ro.i1 (i32)"(i32 426)
%0 = call i1 @"dx.hl.op.ro.i1 (i32)"(i32 425)
br i1 %0, label %if.then, label %if.else

if.then:
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/HLSLFileCheckLit/hlsl/intrinsics/basic/debugbreak.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// RUN: %dxc -T cs_6_10 -ast-dump %s | FileCheck %s --check-prefix=AST

// CHECK: call void @dx.op.debugBreak(i32 -2147483615) ; DebugBreak()
// FCGL: call void @"dx.hl.op..void (i32)"(i32 425)
// FCGL: call void @"dx.hl.op..void (i32)"(i32 424)

// AST: CallExpr {{.*}} 'void'
// AST-NEXT: `-ImplicitCastExpr {{.*}} 'void (*)()' <FunctionToPointerDecay>
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/HLSLFileCheckLit/hlsl/intrinsics/basic/isdebuggerpresent.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

// CHECK: call i1 @dx.op.isDebuggerPresent(i32 -2147483614) ; IsDebuggerPresent()

// FCGL: call i1 @"dx.hl.op.ro.i1 (i32)"(i32 426)
// FCGL: call i1 @"dx.hl.op.ro.i1 (i32)"(i32 425)

// AST: CallExpr {{.*}} 'bool'
// AST-NEXT: `-ImplicitCastExpr {{.*}} 'bool (*)()' <FunctionToPointerDecay>
Expand Down
2 changes: 0 additions & 2 deletions utils/hct/gen_intrin_main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,8 @@ void [[min_sm=6.10]] __builtin_VectorAccumulate(in LinAlg<c> InputVector, in RWB

// LinAlg intrinsics

// TODO: Update return type for CreateMatrix to MatrixRef
// TODO: Replace all int MatrixRef with MatrixRef type
// TODO: Replace all int GroupSharedMem with groupshared memory
void [[min_sm=6.10]] __builtin_LinAlg_CreateMatrix();
void [[min_sm=6.10]] __builtin_LinAlg_FillMatrix(int MatrixRef, numeric value);
void [[min_sm=6.10]] __builtin_LinAlg_CopyConvertMatrix(int MatrixRefDest, int MatrixRefSrc, bool transpose);
void [[min_sm=6.10]] __builtin_LinAlg_MatrixLoadFromDescriptor(int MatrixRef, resource buf, int32_only offset, int32_only stride, int32_only layout);
Expand Down
43 changes: 21 additions & 22 deletions utils/hct/hlsl_intrinsic_opcodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"IntrinsicOpCodes": {
"Num_Intrinsics": 427,
"Num_Intrinsics": 426,
"IOP_AcceptHitAndEndSearch": 0,
"IOP_AddUint64": 1,
"IOP_AllMemoryBarrier": 2,
Expand Down Expand Up @@ -407,26 +407,25 @@
"MOP_CommittedTriangleObjectPositions": 403,
"MOP_DxHitObject_TriangleObjectPositions": 404,
"IOP___builtin_LinAlg_CopyConvertMatrix": 405,
"IOP___builtin_LinAlg_CreateMatrix": 406,
"IOP___builtin_LinAlg_FillMatrix": 407,
"IOP___builtin_LinAlg_MatrixGetCoordinate": 408,
"IOP___builtin_LinAlg_MatrixGetElement": 409,
"IOP___builtin_LinAlg_MatrixLength": 410,
"IOP___builtin_LinAlg_MatrixLoadFromDescriptor": 411,
"IOP___builtin_LinAlg_MatrixLoadFromMemory": 412,
"IOP___builtin_LinAlg_MatrixSetElement": 413,
"IOP___builtin_LinAlg_MatrixStoreToDescriptor": 414,
"IOP___builtin_LinAlg_MatrixStoreToMemory": 415,
"IOP___builtin_LinAlg_MatrixAccumulate": 416,
"IOP___builtin_LinAlg_MatrixMatrixMultiply": 417,
"IOP___builtin_LinAlg_MatrixMatrixMultiplyAccumulate": 418,
"IOP___builtin_LinAlg_MatrixQueryAccumulatorLayout": 419,
"IOP___builtin_LinAlg_MatrixAccumulateToDescriptor": 420,
"IOP___builtin_LinAlg_MatrixAccumulateToMemory": 421,
"IOP___builtin_LinAlg_MatrixOuterProduct": 422,
"IOP___builtin_LinAlg_MatrixVectorMultiply": 423,
"IOP___builtin_LinAlg_MatrixVectorMultiplyAdd": 424,
"IOP_DebugBreak": 425,
"IOP_DxIsDebuggerPresent": 426
"IOP___builtin_LinAlg_FillMatrix": 406,
"IOP___builtin_LinAlg_MatrixGetCoordinate": 407,
"IOP___builtin_LinAlg_MatrixGetElement": 408,
"IOP___builtin_LinAlg_MatrixLength": 409,
"IOP___builtin_LinAlg_MatrixLoadFromDescriptor": 410,
"IOP___builtin_LinAlg_MatrixLoadFromMemory": 411,
"IOP___builtin_LinAlg_MatrixSetElement": 412,
"IOP___builtin_LinAlg_MatrixStoreToDescriptor": 413,
"IOP___builtin_LinAlg_MatrixStoreToMemory": 414,
"IOP___builtin_LinAlg_MatrixAccumulate": 415,
"IOP___builtin_LinAlg_MatrixMatrixMultiply": 416,
"IOP___builtin_LinAlg_MatrixMatrixMultiplyAccumulate": 417,
"IOP___builtin_LinAlg_MatrixQueryAccumulatorLayout": 418,
"IOP___builtin_LinAlg_MatrixAccumulateToDescriptor": 419,
"IOP___builtin_LinAlg_MatrixAccumulateToMemory": 420,
"IOP___builtin_LinAlg_MatrixOuterProduct": 421,
"IOP___builtin_LinAlg_MatrixVectorMultiply": 422,
"IOP___builtin_LinAlg_MatrixVectorMultiplyAdd": 423,
"IOP_DebugBreak": 424,
"IOP_DxIsDebuggerPresent": 425
}
}