Add basic support for Shader Model 6.3 profiles (#594)

* Add basic support for Shader Model 6.3 profiles

This adds `vs_6_3` and friends as available profiles, but doesn't add any new builtins specific to Shader Model 6.3.

In order to better support the ray tracing shader stages, Slang will not automatically map any attempt to compile a DXR shader up to SM 6.3 (the shader model officially required for these stages) and to the `lib_*` profiles (because there are no stage-specific profiles for these cases).

As an added detail, when invoking `dxcompiler.dll` to generate DXIL for DXR shaders, specify an empty entry-point name, since that is expected for `lib_*` profiles.

* Fixup: don't drop [shader(...)] attributes

The previous change makes the "effective profile" for DXR compiles no longer include a stage, but we had been using the stage stored on the effective profile in exactly one place: when determining what to output for a `[shader("...")]` attribute.

This fixup makes it so that we use the stage from the profile on the entry-point layout instead, which seems like the right choice anyway, if we are ever going to emit multiple entry points at once.

4 files changed, 48 insertions, 15 deletions

diff --git a/source/slang/dxc-support.cpp b/source/slang/dxc-support.cpp
index 056fefe2d..68b46f1b9 100644
--- a/source/slang/dxc-support.cpp
+++ b/source/slang/dxc-support.cpp
@@ -133,7 +133,7 @@ namespace Slang
         IDxcOperationResult* dxcResult = nullptr;
         if (FAILED(dxcCompiler->Compile(dxcSourceBlob,
             L"slang",
-            wideEntryPointName.begin(),
+            profile.GetStage() == Stage::Unknown ? L"" : wideEntryPointName.begin(),
             wideProfileName.begin(),
             args,
             argCount,
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 3f88ab82d..1b8de806a 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -4134,7 +4134,7 @@ struct EmitVisitor
         EntryPointLayout*   entryPointLayout)
     {
         auto profile = ctx->shared->effectiveProfile;
-        auto stage = profile.GetStage();
+        auto stage = entryPointLayout->profile.GetStage();
 
         if(profile.getFamily() == ProfileFamily::DX)
         {
diff --git a/source/slang/profile-defs.h b/source/slang/profile-defs.h
index e7000bfa2..2f029aff0 100644
--- a/source/slang/profile-defs.h
+++ b/source/slang/profile-defs.h
@@ -86,16 +86,17 @@ PROFILE_FAMILY(SPRIV)
 // Profile versions
 
 
-PROFILE_VERSION(DX_4_0,				DX)
-PROFILE_VERSION(DX_4_0_Level_9_0,	DX)
-PROFILE_VERSION(DX_4_0_Level_9_1,	DX)
-PROFILE_VERSION(DX_4_0_Level_9_3,	DX)
-PROFILE_VERSION(DX_4_1,				DX)
-PROFILE_VERSION(DX_5_0,				DX)
-PROFILE_VERSION(DX_5_1,				DX)
-PROFILE_VERSION(DX_6_0,				DX)
-PROFILE_VERSION(DX_6_1,				DX)
-PROFILE_VERSION(DX_6_2,				DX)
+PROFILE_VERSION(DX_4_0,             DX)
+PROFILE_VERSION(DX_4_0_Level_9_0,   DX)
+PROFILE_VERSION(DX_4_0_Level_9_1,   DX)
+PROFILE_VERSION(DX_4_0_Level_9_3,   DX)
+PROFILE_VERSION(DX_4_1,             DX)
+PROFILE_VERSION(DX_5_0,             DX)
+PROFILE_VERSION(DX_5_1,             DX)
+PROFILE_VERSION(DX_6_0,             DX)
+PROFILE_VERSION(DX_6_1,             DX)
+PROFILE_VERSION(DX_6_2,             DX)
+PROFILE_VERSION(DX_6_3,             DX)
 
 PROFILE_VERSION(GLSL_110,           GLSL)
 PROFILE_VERSION(GLSL_120,           GLSL)
@@ -120,12 +121,14 @@ PROFILE(DX_Compute_5_1,				cs_5_1,				Compute,	DX_5_1)
 PROFILE(DX_Compute_6_0,				cs_6_0,				Compute,	DX_6_0)
 PROFILE(DX_Compute_6_1,				cs_6_1,				Compute,	DX_6_1)
 PROFILE(DX_Compute_6_2,				cs_6_2,				Compute,	DX_6_2)
+PROFILE(DX_Compute_6_3,				cs_6_3,				Compute,	DX_6_3)
 
 PROFILE(DX_Domain_5_0,				ds_5_0,				Domain,		DX_5_0)
 PROFILE(DX_Domain_5_1,				ds_5_1,				Domain,		DX_5_1)
 PROFILE(DX_Domain_6_0,				ds_6_0,				Domain,		DX_6_0)
 PROFILE(DX_Domain_6_1,				ds_6_1,				Domain,		DX_6_1)
 PROFILE(DX_Domain_6_2,				ds_6_2,				Domain,		DX_6_2)
+PROFILE(DX_Domain_6_3,				ds_6_3,				Domain,		DX_6_3)
 
 PROFILE(DX_Geometry_4_0,			gs_4_0,				Geometry,	DX_4_0)
 PROFILE(DX_Geometry_4_1,			gs_4_1,				Geometry,	DX_4_1)
@@ -134,6 +137,7 @@ PROFILE(DX_Geometry_5_1,			gs_5_1,				Geometry,	DX_5_1)
 PROFILE(DX_Geometry_6_0,			gs_6_0,				Geometry,	DX_6_0)
 PROFILE(DX_Geometry_6_1,			gs_6_1,				Geometry,	DX_6_1)
 PROFILE(DX_Geometry_6_2,			gs_6_2,				Geometry,	DX_6_2)
+PROFILE(DX_Geometry_6_3,			gs_6_3,				Geometry,	DX_6_3)
 
 
 PROFILE(DX_Hull_5_0,				hs_5_0,				Hull,		DX_5_0)
@@ -141,6 +145,7 @@ PROFILE(DX_Hull_5_1,				hs_5_1,				Hull,		DX_5_1)
 PROFILE(DX_Hull_6_0,			    hs_6_0,				Hull,   	DX_6_0)
 PROFILE(DX_Hull_6_1,			    hs_6_1,				Hull,   	DX_6_1)
 PROFILE(DX_Hull_6_2,			    hs_6_2,				Hull,   	DX_6_2)
+PROFILE(DX_Hull_6_3,			    hs_6_3,				Hull,   	DX_6_3)
 
 
 PROFILE(DX_Fragment_4_0,			ps_4_0,				Fragment,	DX_4_0)
@@ -153,6 +158,7 @@ PROFILE(DX_Fragment_5_1,			ps_5_1,				Fragment,	DX_5_1)
 PROFILE(DX_Fragment_6_0,			ps_6_0,				Fragment,	DX_6_0)
 PROFILE(DX_Fragment_6_1,			ps_6_1,				Fragment,	DX_6_1)
 PROFILE(DX_Fragment_6_2,			ps_6_2,				Fragment,	DX_6_2)
+PROFILE(DX_Fragment_6_3,			ps_6_3,				Fragment,	DX_6_3)
 
 
 PROFILE(DX_Vertex_4_0,				vs_4_0,				Vertex,		DX_4_0)
@@ -165,6 +171,7 @@ PROFILE(DX_Vertex_5_1,				vs_5_1,				Vertex,		DX_5_1)
 PROFILE(DX_Vertex_6_0,			    vs_6_0,				Vertex,	DX_6_0)
 PROFILE(DX_Vertex_6_1,			    vs_6_1,				Vertex,	DX_6_1)
 PROFILE(DX_Vertex_6_2,			    vs_6_2,				Vertex,	DX_6_2)
+PROFILE(DX_Vertex_6_3,			    vs_6_3,				Vertex,	DX_6_3)
 
 // TODO: consider making `lib_*_*` alias these...
 PROFILE(DX_None_4_0,              sm_4_0,             Unknown, DX_4_0)
@@ -175,8 +182,26 @@ PROFILE(DX_None_4_1,              sm_4_1,             Unknown, DX_4_1)
 PROFILE(DX_None_5_0,              sm_5_0,             Unknown, DX_5_0)
 PROFILE(DX_None_5_1,              sm_5_1,             Unknown, DX_5_1)
 PROFILE(DX_None_6_0,              sm_6_0,             Unknown, DX_6_0)
-PROFILE(DX_None_6_1,              sm_6_1,             Unknown, DX_6_1)
-PROFILE(DX_None_6_2,              sm_6_2,             Unknown, DX_6_2)
+
+// From Shader Model 6.1 on, the dxc compiler recognizes a `lib` profile
+// that can be used to compile multiple entry points. We want that
+// `lib` name to be the default for how we render these profiles when
+// invoking downstream tools, so we use that instead of the `sm_`
+// prefix, and then re-introduce the `sm_` variants as aliases.
+//
+// TODO: We may eventually want a split between how Slang represents
+// profiles and their names to users, vs. how it renders them when
+// invoking downstream tools, so that the profile name in any
+// error messages can be consistent with our `sm_*` naems above
+//
+PROFILE(DX_Lib_6_1,              lib_6_1,             Unknown, DX_6_1)
+PROFILE(DX_Lib_6_2,              lib_6_2,             Unknown, DX_6_2)
+PROFILE(DX_Lib_6_3,              lib_6_3,             Unknown, DX_6_3)
+
+PROFILE_ALIAS(DX_None_6_1,  DX_Lib_6_1,     sm_6_1)
+PROFILE_ALIAS(DX_None_6_2,  DX_Lib_6_2,     sm_6_2)
+PROFILE_ALIAS(DX_None_6_3,  DX_Lib_6_3,     sm_6_3)
+
 
 // Define all the GLSL profiles
 
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index 57f0e8917..2d3e9ee77 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -154,7 +154,15 @@ Profile getEffectiveProfile(EntryPointRequest* entryPoint, TargetRequest* target
         case Stage::AnyHit:
         case Stage::Miss:
         case Stage::Callable:
-            stageMinVersion = ProfileVersion::DX_6_1;
+            stageMinVersion = ProfileVersion::DX_6_3;
+
+            // When compiling for DXR, we don't actually have distinct
+            // profiles for all of the DXR stages (e.g., there is no
+            // `raygeneration_6_3` profile), so we will clear out
+            // the stage part of the effective profile to avoid
+            // using a stage that isn't allowed downstream.
+            //
+            effectiveProfile.setStage(Stage::Unknown);
             break;
 
         //  TODO: Add equivalent logic for geometry, tessellation, and compute stages.