Skip to content

[SER] Declare all SER HLSL intrinsics #7347

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
tex3d merged 1 commit into from
Apr 15, 2025
Merged

[SER] Declare all SER HLSL intrinsics #7347

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
29 changes: 28 additions & 1 deletion include/dxc/HlslIntrinsicOp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,34 @@ enum class IntrinsicOp {
MOP_TraceRayInline = 325,
MOP_WorldRayDirection = 326,
MOP_WorldRayOrigin = 327,
MOP_DxHitObject_FromRayQuery = 363,
MOP_DxHitObject_GetAttributes = 364,
MOP_DxHitObject_GetGeometryIndex = 365,
MOP_DxHitObject_GetHitKind = 366,
MOP_DxHitObject_GetInstanceID = 367,
MOP_DxHitObject_GetInstanceIndex = 368,
MOP_DxHitObject_GetObjectRayDirection = 369,
MOP_DxHitObject_GetObjectRayOrigin = 370,
MOP_DxHitObject_GetObjectToWorld3x4 = 371,
MOP_DxHitObject_GetObjectToWorld4x3 = 372,
MOP_DxHitObject_GetPrimitiveIndex = 373,
MOP_DxHitObject_GetRayFlags = 374,
MOP_DxHitObject_GetRayTCurrent = 375,
MOP_DxHitObject_GetRayTMin = 376,
MOP_DxHitObject_GetShaderTableIndex = 377,
MOP_DxHitObject_GetWorldRayDirection = 378,
MOP_DxHitObject_GetWorldRayOrigin = 379,
MOP_DxHitObject_GetWorldToObject3x4 = 380,
MOP_DxHitObject_GetWorldToObject4x3 = 381,
MOP_DxHitObject_Invoke = 382,
MOP_DxHitObject_IsHit = 383,
MOP_DxHitObject_IsMiss = 384,
MOP_DxHitObject_IsNop = 385,
MOP_DxHitObject_LoadLocalRootTableConstant = 386,
MOP_DxHitObject_MakeMiss = 387,
MOP_DxHitObject_MakeNop = 358,
MOP_DxHitObject_SetShaderTableIndex = 388,
MOP_DxHitObject_TraceRay = 389,
IOP_DxMaybeReorderThread = 359,
MOP_Count = 328,
MOP_FinishedCrossGroupSharing = 329,
Expand Down Expand Up @@ -369,7 +396,7 @@ enum class IntrinsicOp {
IOP_usign = 355,
MOP_InterlockedUMax = 356,
MOP_InterlockedUMin = 357,
Num_Intrinsics = 363,
Num_Intrinsics = 390,
};
inline bool HasUnsignedIntrinsicOpcode(IntrinsicOp opcode) {
switch (opcode) {
Expand Down
7 changes: 4 additions & 3 deletions include/dxc/dxcapi.internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,13 @@ enum LEGAL_INTRINSIC_COMPTYPES {
LICOMPTYPE_THREAD_NODE_OUTPUT_RECORDS = 50,

LICOMPTYPE_HIT_OBJECT = 51,
LICOMPTYPE_RAY_QUERY = 52,

#ifdef ENABLE_SPIRV_CODEGEN
LICOMPTYPE_VK_BUFFER_POINTER = 52,
LICOMPTYPE_COUNT = 53
LICOMPTYPE_VK_BUFFER_POINTER = 53,
LICOMPTYPE_COUNT = 54
#else
LICOMPTYPE_COUNT = 52
LICOMPTYPE_COUNT = 53
#endif
};

Expand Down
128 changes: 128 additions & 0 deletions lib/HLSL/HLOperationLower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6197,6 +6197,77 @@ Value *TranslateMaybeReorderThread(CallInst *CI, IntrinsicOp IOP,
bool &Translated) {
return nullptr; // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectFromRayQuery(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectTraceRay(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectInvoke(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return nullptr; // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectGetAttributes(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectScalarGetter(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectVectorGetter(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectMatrixGetter(CallInst *CI, IntrinsicOp IOP,
OP::OpCode OpCode,
HLOperationLowerHelper &Helper,
HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectLoadLocalRootTableConstant(
CallInst *CI, IntrinsicOp IOP, OP::OpCode OpCode,
HLOperationLowerHelper &Helper, HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

Value *TranslateHitObjectSetShaderTableIndex(
CallInst *CI, IntrinsicOp IOP, OP::OpCode OpCode,
HLOperationLowerHelper &Helper, HLObjectOperationLowerHelper *pObjHelper,
bool &Translated) {
return UndefValue::get(CI->getType()); // TODO: Merge SER DXIL patches
}

} // namespace

// Resource Handle.
Expand Down Expand Up @@ -6908,6 +6979,63 @@ IntrinsicLower gLowerTable[] = {
DXIL::OpCode::NumOpCodes},
{IntrinsicOp::MOP_GetBufferContents, UnsupportedVulkanIntrinsic,
DXIL::OpCode::NumOpCodes},
{IntrinsicOp::MOP_DxHitObject_FromRayQuery, TranslateHitObjectFromRayQuery,
DXIL::OpCode::HitObject_FromRayQuery},
{IntrinsicOp::MOP_DxHitObject_GetAttributes,
TranslateHitObjectGetAttributes, DXIL::OpCode::HitObject_Attributes},
{IntrinsicOp::MOP_DxHitObject_GetGeometryIndex,
TranslateHitObjectScalarGetter, DXIL::OpCode::HitObject_GeometryIndex},
{IntrinsicOp::MOP_DxHitObject_GetHitKind, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_HitKind},
{IntrinsicOp::MOP_DxHitObject_GetInstanceID, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_InstanceID},
{IntrinsicOp::MOP_DxHitObject_GetInstanceIndex,
TranslateHitObjectScalarGetter, DXIL::OpCode::HitObject_InstanceIndex},
{IntrinsicOp::MOP_DxHitObject_GetObjectRayDirection,
TranslateHitObjectVectorGetter,
DXIL::OpCode::HitObject_ObjectRayDirection},
{IntrinsicOp::MOP_DxHitObject_GetObjectRayOrigin,
TranslateHitObjectVectorGetter, DXIL::OpCode::HitObject_ObjectRayOrigin},
{IntrinsicOp::MOP_DxHitObject_GetObjectToWorld3x4,
TranslateHitObjectMatrixGetter, DXIL::OpCode::HitObject_ObjectToWorld3x4},
{IntrinsicOp::MOP_DxHitObject_GetObjectToWorld4x3,
TranslateHitObjectMatrixGetter, DXIL::OpCode::HitObject_ObjectToWorld3x4},
{IntrinsicOp::MOP_DxHitObject_GetPrimitiveIndex,
TranslateHitObjectScalarGetter, DXIL::OpCode::HitObject_PrimitiveIndex},
{IntrinsicOp::MOP_DxHitObject_GetRayFlags, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_RayFlags},
{IntrinsicOp::MOP_DxHitObject_GetRayTCurrent,
TranslateHitObjectScalarGetter, DXIL::OpCode::HitObject_RayTCurrent},
{IntrinsicOp::MOP_DxHitObject_GetRayTMin, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_RayTMin},
{IntrinsicOp::MOP_DxHitObject_GetShaderTableIndex,
TranslateHitObjectScalarGetter, DXIL::OpCode::HitObject_ShaderTableIndex},
{IntrinsicOp::MOP_DxHitObject_GetWorldRayDirection,
TranslateHitObjectVectorGetter, DXIL::OpCode::HitObject_WorldRayDirection},
{IntrinsicOp::MOP_DxHitObject_GetWorldRayOrigin,
TranslateHitObjectVectorGetter, DXIL::OpCode::HitObject_WorldRayOrigin},
{IntrinsicOp::MOP_DxHitObject_GetWorldToObject3x4,
TranslateHitObjectMatrixGetter, DXIL::OpCode::HitObject_WorldToObject3x4},
{IntrinsicOp::MOP_DxHitObject_GetWorldToObject4x3,
TranslateHitObjectMatrixGetter, DXIL::OpCode::HitObject_WorldToObject3x4},
{IntrinsicOp::MOP_DxHitObject_Invoke, TranslateHitObjectInvoke,
DXIL::OpCode::HitObject_Invoke},
{IntrinsicOp::MOP_DxHitObject_IsHit, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_IsHit},
{IntrinsicOp::MOP_DxHitObject_IsMiss, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_IsMiss},
{IntrinsicOp::MOP_DxHitObject_IsNop, TranslateHitObjectScalarGetter,
DXIL::OpCode::HitObject_IsNop},
{IntrinsicOp::MOP_DxHitObject_LoadLocalRootTableConstant,
TranslateHitObjectLoadLocalRootTableConstant,
DXIL::OpCode::HitObject_LoadLocalRootTableConstant},
{IntrinsicOp::MOP_DxHitObject_MakeMiss, TranslateHitObjectMake,
DXIL::OpCode::HitObject_MakeMiss},
{IntrinsicOp::MOP_DxHitObject_SetShaderTableIndex,
TranslateHitObjectSetShaderTableIndex,
DXIL::OpCode::HitObject_SetShaderTableIndex},
{IntrinsicOp::MOP_DxHitObject_TraceRay, TranslateHitObjectTraceRay,
DXIL::OpCode::HitObject_TraceRay},
};
} // namespace
static_assert(
Expand Down
10 changes: 7 additions & 3 deletions tools/clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,9 +580,9 @@ const UINT g_uBasicKindProps[] = {
0, // AR_OBJECT_PROCEDURAL_PRIMITIVE_HIT_GROUP,
0, // AR_OBJECT_RAYTRACING_PIPELINE_CONFIG1,

BPROP_OBJECT, // AR_OBJECT_RAY_QUERY,
BPROP_OBJECT, // AR_OBJECT_HEAP_RESOURCE,
BPROP_OBJECT, // AR_OBJECT_HEAP_SAMPLER,
LICOMPTYPE_RAY_QUERY, // AR_OBJECT_RAY_QUERY,
BPROP_OBJECT, // AR_OBJECT_HEAP_RESOURCE,
BPROP_OBJECT, // AR_OBJECT_HEAP_SAMPLER,

BPROP_OBJECT | BPROP_RWBUFFER | BPROP_TEXTURE, // AR_OBJECT_RWTEXTURE2DMS
BPROP_OBJECT | BPROP_RWBUFFER |
Expand Down Expand Up @@ -1135,6 +1135,9 @@ static const ArBasicKind g_ResourceCT[] = {AR_OBJECT_HEAP_RESOURCE,

static const ArBasicKind g_RayDescCT[] = {AR_OBJECT_RAY_DESC, AR_BASIC_UNKNOWN};

static const ArBasicKind g_RayQueryCT[] = {AR_OBJECT_RAY_QUERY,
AR_BASIC_UNKNOWN};

static const ArBasicKind g_AccelerationStructCT[] = {
AR_OBJECT_ACCELERATION_STRUCT, AR_BASIC_UNKNOWN};

Expand Down Expand Up @@ -1297,6 +1300,7 @@ const ArBasicKind *g_LegalIntrinsicCompTypes[] = {
g_GroupNodeOutputRecordsCT, // LICOMPTYPE_GROUP_NODE_OUTPUT_RECORDS
g_ThreadNodeOutputRecordsCT, // LICOMPTYPE_THREAD_NODE_OUTPUT_RECORDS
g_DxHitObjectCT, // LICOMPTYPE_HIT_OBJECT
g_RayQueryCT, // LICOMPTYPE_RAY_QUERY
#ifdef ENABLE_SPIRV_CODEGEN
g_VKBufferPointerCT, // LICOMPTYPE_VK_BUFFER_POINTER
#endif
Expand Down
28 changes: 28 additions & 0 deletions utils/hct/gen_intrin_main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,34 @@ uint [[ro]] CommittedInstanceContributionToHitGroupIndex();
// Shader Execution Reordering
namespace DxHitObjectMethods {
DxHitObject [[static,class_prefix,min_sm=6.9]] MakeNop();
DxHitObject [[static,class_prefix,min_sm=6.9]] MakeMiss(in uint RayFlags, in uint MissShaderIndex, in ray_desc Ray);
DxHitObject [[static,class_prefix,min_sm=6.9]] FromRayQuery(in RayQuery rq);
DxHitObject [[static,class_prefix,min_sm=6.9]] FromRayQuery(in RayQuery rq, in uint HitKind, in udt Attributes);
DxHitObject [[static,class_prefix,min_sm=6.9]] TraceRay(in acceleration_struct AccelerationStructure, in uint RayFlags, in uint InstanceInclusionMask, in uint RayContributionToHitGroupIndex, in uint MultiplierForGeometryContributionToHitGroupIndex, in uint MissShaderIndex, in ray_desc Ray, inout udt Payload);
void [[static,class_prefix,min_sm=6.9]] Invoke(in DxHitObject ho, inout udt Payload);
bool [[rn,class_prefix,min_sm=6.9]] IsMiss();
bool [[rn,class_prefix,min_sm=6.9]] IsHit();
bool [[rn,class_prefix,min_sm=6.9]] IsNop();
uint [[rn,class_prefix,min_sm=6.9]] GetRayFlags();
float [[rn,class_prefix,min_sm=6.9]] GetRayTMin();
float [[rn,class_prefix,min_sm=6.9]] GetRayTCurrent();
float<3> [[rn,class_prefix,min_sm=6.9]] GetWorldRayOrigin();
float<3> [[rn,class_prefix,min_sm=6.9]] GetWorldRayDirection();
float<3> [[rn,class_prefix,min_sm=6.9]] GetObjectRayOrigin();
float<3> [[rn,class_prefix,min_sm=6.9]] GetObjectRayDirection();
float<3,4> [[rn,class_prefix,min_sm=6.9]] GetObjectToWorld3x4();
float<4,3> [[rn,class_prefix,min_sm=6.9]] GetObjectToWorld4x3();
float<3,4> [[rn,class_prefix,min_sm=6.9]] GetWorldToObject3x4();
float<4,3> [[rn,class_prefix,min_sm=6.9]] GetWorldToObject4x3();
uint [[rn,class_prefix,min_sm=6.9]] GetGeometryIndex();
uint [[rn,class_prefix,min_sm=6.9]] GetInstanceIndex();
uint [[rn,class_prefix,min_sm=6.9]] GetInstanceID();
uint [[rn,class_prefix,min_sm=6.9]] GetPrimitiveIndex();
uint [[rn,class_prefix,min_sm=6.9]] GetHitKind();
uint [[rn,class_prefix,min_sm=6.9]] GetShaderTableIndex();
$funcT [[class_prefix,min_sm=6.9]] GetAttributes();
void [[class_prefix,min_sm=6.9]] SetShaderTableIndex(in uint RecordIndex);
uint [[ro,class_prefix,min_sm=6.9]] LoadLocalRootTableConstant(in uint RootConstantOffsetInBytes);
} namespace

namespace DxIntrinsics {
Expand Down
1 change: 1 addition & 0 deletions utils/hct/hctdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9183,6 +9183,7 @@ def __init__(self, intrinsic_defs, opcode_data):
"ThreadNodeOutputRecords": "LICOMPTYPE_THREAD_NODE_OUTPUT_RECORDS",
"DxHitObject": "LICOMPTYPE_HIT_OBJECT",
"VkBufferPointer": "LICOMPTYPE_VK_BUFFER_POINTER",
"RayQuery": "LICOMPTYPE_RAY_QUERY",
}

self.trans_rowcol = {"r": "IA_R", "c": "IA_C", "r2": "IA_R2", "c2": "IA_C2"}
Expand Down
31 changes: 29 additions & 2 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": 363,
"Num_Intrinsics": 390,
"IOP_AcceptHitAndEndSearch": 0,
"IOP_AddUint64": 1,
"IOP_AllMemoryBarrier": 2,
Expand Down Expand Up @@ -363,6 +363,33 @@
"IOP_DxMaybeReorderThread": 359,
"IOP_Vkreinterpret_pointer_cast": 360,
"IOP_Vkstatic_pointer_cast": 361,
"MOP_GetBufferContents": 362
"MOP_GetBufferContents": 362,
"MOP_DxHitObject_FromRayQuery": 363,
"MOP_DxHitObject_GetAttributes": 364,
"MOP_DxHitObject_GetGeometryIndex": 365,
"MOP_DxHitObject_GetHitKind": 366,
"MOP_DxHitObject_GetInstanceID": 367,
"MOP_DxHitObject_GetInstanceIndex": 368,
"MOP_DxHitObject_GetObjectRayDirection": 369,
"MOP_DxHitObject_GetObjectRayOrigin": 370,
"MOP_DxHitObject_GetObjectToWorld3x4": 371,
"MOP_DxHitObject_GetObjectToWorld4x3": 372,
"MOP_DxHitObject_GetPrimitiveIndex": 373,
"MOP_DxHitObject_GetRayFlags": 374,
"MOP_DxHitObject_GetRayTCurrent": 375,
"MOP_DxHitObject_GetRayTMin": 376,
"MOP_DxHitObject_GetShaderTableIndex": 377,
"MOP_DxHitObject_GetWorldRayDirection": 378,
"MOP_DxHitObject_GetWorldRayOrigin": 379,
"MOP_DxHitObject_GetWorldToObject3x4": 380,
"MOP_DxHitObject_GetWorldToObject4x3": 381,
"MOP_DxHitObject_Invoke": 382,
"MOP_DxHitObject_IsHit": 383,
"MOP_DxHitObject_IsMiss": 384,
"MOP_DxHitObject_IsNop": 385,
"MOP_DxHitObject_LoadLocalRootTableConstant": 386,
"MOP_DxHitObject_MakeMiss": 387,
"MOP_DxHitObject_SetShaderTableIndex": 388,
"MOP_DxHitObject_TraceRay": 389
}
}