Add HLSL generator #3

alichraghi · 2024-08-30T12:42:50Z

out.hlsl is basically the output of running this:

cd tools/hlsl_generator/
python3 gen.py out.hlsl

tools/hlsl_generator/gen.py

devshgraphicsprogramming · 2024-09-07T19:40:58Z

tools/hlsl_generator/gen.py

+//! General Decls
+template<uint32_t StorageClass, typename T>
+using pointer_t = vk::SpirvOpaqueType<spv::OpTypePointer, vk::Literal< vk::integral_constant<uint32_t, StorageClass> >, T>;


pointer_t should be done in terms of

template<uint32_t StorageClass, typename T> struct pointer { using type = vk::SpirvOpaqueType<spv::OpTypePointer, vk::Literal< vk::integral_constant<uint32_t, StorageClass> >, T>; }; // partial spec for BDA template<typename T> struct pointer<StorageClassPhysicalStorageBuffer,T> { using type = vk::SpirvType<spv::OpTypePointer,sizeof(uint64_t),sizeof(uint64_t),vk::Literal< vk::integral_constant<uint32_t, StorageClass> >, T>; }; template<uint32_t StorageClass, typename T> using pointer_t = pointer::type;

and also have a is_pointer::value tester + is_pointer_v

this will go into type_traits.hlsl. right?

no it will go here because its spirv specific, it can be built with type_traits though, such as is_same_v

devshgraphicsprogramming · 2024-09-07T19:47:37Z

tools/hlsl_generator/gen.py

+//! Std 450 Extended set operations
+template<typename SquareMatrix>
+[[vk::ext_instruction(GLSLstd450MatrixInverse)]]
+SquareMatrix matrixInverse(NBL_CONST_REF_ARG(SquareMatrix) mat);


you want to gen all the extended instruction set stuff

devshgraphicsprogramming · 2024-09-07T20:06:56Z

tools/hlsl_generator/gen.py

+                case "SubgroupEqMask": builtin_type = "uint32_t4"
+                case "SubgroupGeMask": builtin_type = "uint32_t4"
+                case "SubgroupGtMask": builtin_type = "uint32_t4"
+                case "SubgroupLeMask": builtin_type = "uint32_t4"
+                case "SubgroupLtMask": builtin_type = "uint32_t4"
+                case "SubgroupSize": builtin_type = "uint32_t"
+                case "NumSubgroups": builtin_type = "uint32_t"
+                case "SubgroupId": builtin_type = "uint32_t"
+                case "SubgroupLocalInvocationId": builtin_type = "uint32_t"


some of the builtins also need caps or extensions

devshgraphicsprogramming · 2024-09-07T20:08:14Z

tools/hlsl_generator/gen.py

+        writer.write("\n//! Instructions\n")
+        for instruction in grammer["instructions"]:
+            match instruction["class"]:
+                case "Atomic":
+                    processInst(writer, instruction, InstOptions())
+                    processInst(writer, instruction, InstOptions(shape=Shape.PTR_TEMPLATE))
+                case "Memory":
+                    processInst(writer, instruction, InstOptions(shape=Shape.PTR_TEMPLATE))
+                    processInst(writer, instruction, InstOptions(shape=Shape.PSB_RT))
+                case "Barrier" | "Bit":
+                    processInst(writer, instruction, InstOptions())
+                case "Reserved":
+                    match instruction["opname"]:
+                        case "OpBeginInvocationInterlockEXT" | "OpEndInvocationInterlockEXT":
+                            processInst(writer, instruction, InstOptions())
+                case "Non-Uniform":
+                    match instruction["opname"]:
+                        case "OpGroupNonUniformElect" | "OpGroupNonUniformAll" | "OpGroupNonUniformAny" | "OpGroupNonUniformAllEqual":
+                            processInst(writer, instruction, InstOptions(result_ty="bool"))
+                        case "OpGroupNonUniformBallot":
+                            processInst(writer, instruction, InstOptions(result_ty="uint32_t4",op_ty="bool"))
+                        case "OpGroupNonUniformInverseBallot" | "OpGroupNonUniformBallotBitExtract":
+                            processInst(writer, instruction, InstOptions(result_ty="bool",op_ty="uint32_t4"))
+                        case "OpGroupNonUniformBallotBitCount" | "OpGroupNonUniformBallotFindLSB" | "OpGroupNonUniformBallotFindMSB":
+                            processInst(writer, instruction, InstOptions(result_ty="uint32_t",op_ty="uint32_t4"))
+                        case _: processInst(writer, instruction, InstOptions())
+                case _: continue # TODO
+
+        writer.write(foot)


it would be good to print to a log anything to skipped

devshgraphicsprogramming · 2024-09-07T20:08:41Z

tools/hlsl_generator/gen.py

+                    processInst(writer, instruction, InstOptions(shape=Shape.PTR_TEMPLATE))
+                case "Memory":
+                    processInst(writer, instruction, InstOptions(shape=Shape.PTR_TEMPLATE))
+                    processInst(writer, instruction, InstOptions(shape=Shape.PSB_RT))


Load/Store for BDA pointers should probably be handwritten

devshgraphicsprogramming · 2024-09-07T20:08:53Z

tools/hlsl_generator/gen.py

+        writer.write("\n//! Group Operations\nnamespace group_operation\n{\n")
+        for go in group_operations:
+            name = go["enumerant"]
+            value = go["value"]
+            writer.write("\tstatic const uint32_t " + name + " = " + str(value) + ";\n")
+        writer.write("}\n")


why not just emit an enum?

devshgraphicsprogramming · 2024-09-07T20:09:15Z

tools/hlsl_generator/gen.py

+            if cap == "Shader" or cap == "Kernel": continue
+            caps.append(cap)


anything with Kernel you need to skip emitting

devshgraphicsprogramming · 2024-09-07T20:10:09Z

tools/hlsl_generator/gen.py

+            case "U":
+                fn_name = fn_name[0:m[1][0]] + fn_name[m[1][1]:]
+                result_types = ["uint32_t", "uint64_t"]
+                break
+            case "S":
+                fn_name = fn_name[0:m[1][0]] + fn_name[m[1][1]:]
+                result_types = ["int32_t", "int64_t"]


need a condition about being signed or unsigner

Also result types can be 16 bit ints too!

devshgraphicsprogramming · 2024-09-07T20:10:20Z

tools/hlsl_generator/gen.py

+                break
+            case "F":
+                fn_name = fn_name[0:m[1][0]] + fn_name[m[1][1]:]
+                result_types = ["float"]


use sized floats

Signed-off-by: Ali Cheraghi <[email protected]>

devshgraphicsprogramming · 2024-09-09T15:49:57Z

tools/hlsl_generator/gen.py

+//! General Decls
+template<class T>
+NBL_CONSTEXPR_STATIC_INLINE bool is_pointer_v = is_spirv_type<T>::value;
+
+template<uint32_t StorageClass, typename T>
+struct pointer
+{
+   using type = vk::SpirvOpaqueType<spv::OpTypePointer, vk::Literal< vk::integral_constant<uint32_t, StorageClass> >, T>;
+};
+// partial spec for BDA
+template<typename T>
+struct pointer<spv::StorageClassPhysicalStorageBuffer, T>
+{
+   using type = vk::SpirvType<spv::OpTypePointer, sizeof(uint64_t), sizeof(uint64_t), vk::Literal<vk::integral_constant<uint32_t, spv::StorageClassPhysicalStorageBuffer> >, T>;
+};
+
+template<uint32_t StorageClass, typename T>
+using pointer_t = typename pointer<StorageClass, T>::type;
+


only is_ should be implemented via structs

wdym? it's from the snippet you sent here #3 (comment)

sorry I'm dumb.

Still the is_pointer_v is wrong cause you're checking for being a spir-v type, not OpTypePointer

Signed-off-by: Ali Cheraghi <[email protected]>

AnastaZIuk reviewed Aug 30, 2024

View reviewed changes

tools/hlsl_generator/gen.py Outdated Show resolved Hide resolved

AnastaZIuk reviewed Aug 30, 2024

View reviewed changes

tools/hlsl_generator/gen.py Outdated Show resolved Hide resolved

alichraghi force-pushed the header_4_hlsl branch from 5577b4b to 8194a6a Compare August 31, 2024 19:53

Add HLSL generator

20034bb

alichraghi force-pushed the header_4_hlsl branch from 8194a6a to 20034bb Compare August 31, 2024 20:37

alichraghi mentioned this pull request Sep 3, 2024

builtin: update inline spirv hlsl Devsh-Graphics-Programming/Nabla#739

Open

devshgraphicsprogramming reviewed Sep 7, 2024

View reviewed changes

alichraghi added 14 commits September 8, 2024 13:46

hlsl_generator: fix formatting and add use is_pointer_v for bitcast

2146029

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: ignore instructions with kernel capability

9b33a29

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: emit needed capabilities for overloaded instructions

3f41681

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: don't emit instructions with clashing capabilities

d27eff5

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: skip OpenCL+INTEL specific instructions

62f3976

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: add checks for final bitcast overload

78d5eab

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: add missing capability for BDA load/store

5b34f6d

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: add type constraint for bit instructions

481e3bd

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: fix vector instructions type

5a13b58

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: add missing invocation instructions

08de8a5

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: add missing capability of some builtins

c9da81a

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: fix typo

725bdb4

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: fix another typo

9778007

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: update pointer_t impl

e0919e8

Signed-off-by: Ali Cheraghi <[email protected]>

devshgraphicsprogramming reviewed Sep 9, 2024

View reviewed changes

alichraghi added 3 commits September 9, 2024 23:07

hlsl_generator: don't emit unneccesary overloads

a2e0b6a

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: handwritten BDA instructions

c387d96

Signed-off-by: Ali Cheraghi <[email protected]>

hlsl_generator: generate glsl.std extended instructions

5b9371a

Signed-off-by: Ali Cheraghi <[email protected]>

alichraghi force-pushed the header_4_hlsl branch from 76253c2 to 5b9371a Compare September 12, 2024 16:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add HLSL generator #3

Add HLSL generator #3

alichraghi commented Aug 30, 2024

devshgraphicsprogramming Sep 7, 2024

alichraghi Sep 9, 2024 •

edited

Loading

devshgraphicsprogramming Sep 9, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 7, 2024

devshgraphicsprogramming Sep 9, 2024

alichraghi Sep 9, 2024

devshgraphicsprogramming Sep 9, 2024

		if cap == "Shader" or cap == "Kernel": continue
		caps.append(cap)

Add HLSL generator #3

Are you sure you want to change the base?

Add HLSL generator #3

Conversation

alichraghi commented Aug 30, 2024

Choose a reason for hiding this comment

alichraghi Sep 9, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alichraghi Sep 9, 2024 •

edited

Loading