Merge branch 'master' into bugfix/gh-2890_1

Author: expipiplus1

cmake/CompilerFlags.cmake

@@ -205,6 +205,7 @@ function(set_default_compile_options target)
             $<$<BOOL:${SLANG_ENABLE_FULL_DEBUG_VALIDATION}>:SLANG_ENABLE_FULL_IR_VALIDATION>
             $<$<BOOL:${SLANG_ENABLE_IR_BREAK_ALLOC}>:SLANG_ENABLE_IR_BREAK_ALLOC>
             $<$<BOOL:${SLANG_ENABLE_DX_ON_VK}>:SLANG_CONFIG_DX_ON_VK>
+            $<$<STREQUAL:${SLANG_LIB_TYPE},STATIC>:STB_IMAGE_STATIC>
     )
 
     if(SLANG_ENABLE_ASAN)

docs/building.md

@@ -321,6 +321,21 @@ cmake -B build -G Ninja
 cmake --build build -j
 ```
 
+## Static linking against libslang
+
+If linking against a static `libslang.a` you will need to link against some
+dependencies also if you're not already incorporating them into your project.
+
+You will need to link against:
+
+```
+${SLANG_DIR}/build/Release/lib/libslang.a
+${SLANG_DIR}/build/Release/lib/libcompiler-core.a
+${SLANG_DIR}/build/Release/lib/libcore.a
+${SLANG_DIR}/build/external/miniz/libminiz.a
+${SLANG_DIR}/build/external/lz4/build/cmake/liblz4.a
+```
+
 ## Notes
 
 [^1] below 3.25, CMake lacks the ability to mark directories as being

external/CMakeLists.txt

@@ -89,11 +89,19 @@ endif()
 
 # imgui
 add_library(imgui INTERFACE)
-target_include_directories(imgui INTERFACE "${CMAKE_CURRENT_LIST_DIR}/imgui")
+target_include_directories(
+    imgui
+    ${system}
+    INTERFACE "${CMAKE_CURRENT_LIST_DIR}/imgui"
+)
 
 # stb
 add_library(stb INTERFACE)
-target_include_directories(stb INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb")
+target_include_directories(
+    stb
+    ${system}
+    INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb"
+)
 
 # slang-rhi
 if(SLANG_ENABLE_SLANG_RHI)

source/slang/hlsl.meta.slang

@@ -23667,6 +23667,8 @@ void coopVecOuterProductAccumulate<T : __BuiltinArithmeticType, let M : int, let
 {
     __target_switch
     {
+    case hlsl:
+        __intrinsic_asm "$0.OuterProductAccumulate($1, $2, $3, $4, $5, $6)";
     case spirv:
         let matrixInterpretationSpirv : int = __getSpvCoopVecComponentType(matrixInterpretation);
         let memoryLayoutSpirv : int = __getSpvCoopVecMatrixLayout(memoryLayout);
@@ -23742,6 +23744,8 @@ void coopVecReduceSumAccumulate<T : __BuiltinArithmeticType, let N : int>(
 {
     __target_switch
     {
+    case hlsl:
+        __intrinsic_asm "$0.ReduceSumAccumulate($1, $2)";
     case spirv:
         let bufferPtr = buffer.GetBufferPointer();
         spirv_asm

source/slang/slang-reflection-json.cpp

@@ -328,6 +328,22 @@ static void emitUserAttributes(PrettyWriter& writer, slang::VariableReflection*
         writer << "]";
     }
 }
+static void emitUserAttributes(PrettyWriter& writer, slang::FunctionReflection* func)
+{
+    auto attribCount = func->getUserAttributeCount();
+    if (attribCount)
+    {
+        writer << ",\n\"userAttribs\": [";
+        for (unsigned int i = 0; i < attribCount; i++)
+        {
+            if (i > 0)
+                writer << ",\n";
+            auto attrib = func->getUserAttributeByIndex(i);
+            emitUserAttributeJSON(writer, attrib);
+        }
+        writer << "]";
+    }
+}
 
 static void emitReflectionVarLayoutJSON(PrettyWriter& writer, slang::VariableLayoutReflection* var)
 {
@@ -1091,6 +1107,8 @@ static void emitReflectionEntryPointJSON(
         writer << "\n]";
     }
 
+    emitUserAttributes(writer, entryPoint->getFunction());
+
     writer.dedent();
     writer << "\n}";
 }

tests/reflection/attribute.slang

@@ -5,6 +5,7 @@
 //TEST:REFLECTION:-stage compute -entry main -target hlsl -no-codegen
 
 [__AttributeUsage(_AttributeTargets.Struct)]
+[__AttributeUsage(_AttributeTargets.Function)]
 struct MyStructAttribute
 {
     int iParam;
@@ -58,6 +59,7 @@ D param3;
 [StructVarParam(1)] int globalInt2;
 
 
+[MyStruct(2, 3.0)]
 [numthreads(1, 1, 1)]
 void main(
     uint3 dispatchThreadID : SV_DispatchThreadID,

tests/reflection/attribute.slang.expected

@@ -310,7 +310,15 @@ standard output = {
                     }
                 }
             ],
-            "threadGroupSize": [1, 1, 1]
+            "threadGroupSize": [1, 1, 1],
+            "userAttribs": [{
+                "name": "MyStruct",
+                "arguments": [
+                    2,
+                    3.000000
+                ]
+            }
+            ]
         }
     ]
 }

tools/render-test/render-test-main.cpp

@@ -154,28 +154,28 @@ class RenderTestApp
 struct AssignValsFromLayoutContext
 {
     IDevice* device;
-    slang::ISession* slangSession;
+    slang::IComponentType* slangComponent;
     ShaderOutputPlan& outputPlan;
     TestResourceContext& resourceContext;
-    slang::ProgramLayout* slangReflection;
     IAccelerationStructure* accelerationStructure;
 
     AssignValsFromLayoutContext(
         IDevice* device,
-        slang::ISession* slangSession,
+        slang::IComponentType* slangComponent,
         ShaderOutputPlan& outputPlan,
         TestResourceContext& resourceContext,
-        slang::ProgramLayout* slangReflection,
         IAccelerationStructure* accelerationStructure)
         : device(device)
-        , slangSession(slangSession)
+        , slangComponent(slangComponent)
         , outputPlan(outputPlan)
         , resourceContext(resourceContext)
-        , slangReflection(slangReflection)
         , accelerationStructure(accelerationStructure)
     {
     }
 
+    slang::ProgramLayout* slangReflection() { return slangComponent->getLayout(); }
+    slang::ISession* slangSession() { return slangComponent->getSession(); }
+
     void maybeAddOutput(
         ShaderCursor const& dstCursor,
         ShaderInputLayout::Val* srcVal,
@@ -389,7 +389,7 @@ struct AssignValsFromLayoutContext
             // If the input line specified the name of the type
             // to allocate, then we use it directly.
             //
-            slangType = slangReflection->findTypeByName(typeName.getBuffer());
+            slangType = slangReflection()->findTypeByName(typeName.getBuffer());
         }
         else
         {
@@ -418,7 +418,7 @@ struct AssignValsFromLayoutContext
 
         ComPtr<IShaderObject> shaderObject;
         device->createShaderObject(
-            slangSession,
+            slangSession(),
             slangType,
             ShaderObjectContainerType::None,
             shaderObject.writeRef());
@@ -437,7 +437,7 @@ struct AssignValsFromLayoutContext
         List<slang::SpecializationArg> args;
         for (auto& typeName : srcVal->typeArgs)
         {
-            auto slangType = slangReflection->findTypeByName(typeName.getBuffer());
+            auto slangType = slangReflection()->findTypeByName(typeName.getBuffer());
             if (!slangType)
             {
                 StdWriters::getError().print(
@@ -516,42 +516,30 @@ struct AssignValsFromLayoutContext
     }
 };
 
-SlangResult _assignVarsFromLayout(
+static SlangResult _assignVarsFromLayout(
     IDevice* device,
-    slang::ISession* slangSession,
+    slang::IComponentType* slangComponent,
     IShaderObject* shaderObject,
     ShaderInputLayout const& layout,
     ShaderOutputPlan& ioOutputPlan,
     TestResourceContext& ioResourceContext,
-    slang::ProgramLayout* slangReflection,
     IAccelerationStructure* accelerationStructure)
 {
-    AssignValsFromLayoutContext context(
-        device,
-        slangSession,
-        ioOutputPlan,
-        ioResourceContext,
-        slangReflection,
-        accelerationStructure);
+    AssignValsFromLayoutContext
+        context(device, slangComponent, ioOutputPlan, ioResourceContext, accelerationStructure);
     ShaderCursor rootCursor = ShaderCursor(shaderObject);
     return context.assign(rootCursor, layout.rootVal);
 }
 
 Result RenderTestApp::applyBinding(IShaderObject* rootObject)
 {
-    auto slangReflection = (slang::ProgramLayout*)spGetReflection(
-        m_compilationOutput.output.getRequestForReflection());
-    ComPtr<slang::ISession> slangSession;
-    m_compilationOutput.output.m_requestForKernels->getSession(slangSession.writeRef());
-
     return _assignVarsFromLayout(
         m_device,
-        slangSession,
+        m_compilationOutput.output.slangProgram,
         rootObject,
         m_compilationOutput.layout,
         m_outputPlan,
         m_resourceContext,
-        slangReflection,
         m_topLevelAccelerationStructure);
 }
 
@@ -1086,9 +1074,6 @@ Result RenderTestApp::update()
                 m_options.shaderType == Options::ShaderProgramType::GraphicsMeshCompute ||
                 m_options.shaderType == Options::ShaderProgramType::GraphicsTaskMeshCompute)
             {
-                auto request = m_compilationOutput.output.getRequestForReflection();
-                auto slangReflection = (slang::ShaderReflection*)spGetReflection(request);
-
                 SLANG_RETURN_ON_FAIL(writeBindingOutput(m_options.outputPath));
             }
             else

tools/render-test/slang-support.cpp

@@ -36,16 +36,15 @@ void ShaderCompilerUtil::Output::reset()
     }
 
     session = nullptr;
-    m_requestForKernels = nullptr;
-    m_extraRequestForReflection = nullptr;
+    m_requestDEPRECATED = nullptr;
 }
 
-/* static */ SlangResult ShaderCompilerUtil::_compileProgramImpl(
+static SlangResult _compileProgramImpl(
     slang::IGlobalSession* globalSession,
     const Options& options,
-    const Input& input,
+    const ShaderCompilerUtil::Input& input,
     const ShaderCompileRequest& request,
-    Output& out)
+    ShaderCompilerUtil::Output& out)
 {
     out.reset();
 
@@ -58,7 +57,7 @@ void ShaderCompilerUtil::Output::reset()
     SLANG_ALLOW_DEPRECATED_BEGIN
     globalSession->createCompileRequest(slangRequest.writeRef());
     SLANG_ALLOW_DEPRECATED_END
-    out.m_requestForKernels = slangRequest;
+    out.m_requestDEPRECATED = slangRequest;
     out.session = globalSession;
 
     bool hasRepro = false;
@@ -303,12 +302,12 @@ void ShaderCompilerUtil::Output::reset()
     return SLANG_OK;
 }
 
-/* static */ SlangResult ShaderCompilerUtil::compileProgram(
+static SlangResult compileProgram(
     slang::IGlobalSession* globalSession,
     const Options& options,
-    const Input& input,
+    const ShaderCompilerUtil::Input& input,
     const ShaderCompileRequest& request,
-    Output& out)
+    ShaderCompilerUtil::Output& out)
 {
     if (input.passThrough == SLANG_PASS_THROUGH_NONE)
     {
@@ -333,7 +332,7 @@ void ShaderCompilerUtil::Output::reset()
         // compile in another pass using the desired downstream compiler
         // so that we can get the refleciton information we need.
         //
-        Output slangOutput;
+        ShaderCompilerUtil::Output slangOutput;
         if (canUseSlangForPrecompile)
         {
             ShaderCompilerUtil::Input slangInput = input;
@@ -354,17 +353,16 @@ void ShaderCompilerUtil::Output::reset()
         //
         SLANG_RETURN_ON_FAIL(_compileProgramImpl(globalSession, options, input, request, out));
 
-        out.m_extraRequestForReflection = slangOutput.getRequestForReflection();
+        out.m_requestDEPRECATED = slangOutput.m_requestDEPRECATED;
         out.desc.slangGlobalScope = slangOutput.desc.slangGlobalScope;
-        slangOutput.m_requestForKernels = nullptr;
+        slangOutput.m_requestDEPRECATED = nullptr;
 
         return SLANG_OK;
     }
 }
 
-/* static */ SlangResult ShaderCompilerUtil::readSource(
-    const String& inSourcePath,
-    List<char>& outSourceText)
+// Helper for compileWithLayout
+/* static */ SlangResult readSource(const String& inSourcePath, List<char>& outSourceText)
 {
     // Read in the source code
     FILE* sourceFile = fopen(inSourcePath.getBuffer(), "rb");
@@ -392,8 +390,8 @@ void ShaderCompilerUtil::Output::reset()
 /* static */ SlangResult ShaderCompilerUtil::compileWithLayout(
     slang::IGlobalSession* globalSession,
     const Options& options,
-    const ShaderCompilerUtil::Input& input,
-    OutputAndLayout& output)
+    const Input& input,
+    ShaderCompilerUtil::OutputAndLayout& output)
 {
     String sourcePath = options.sourcePath;
     auto shaderType = options.shaderType;
@@ -531,12 +529,7 @@ void ShaderCompilerUtil::Output::reset()
         c.idOverride = conformance.idOverride;
         compileRequest.typeConformances.add(c);
     }
-    return ShaderCompilerUtil::compileProgram(
-        globalSession,
-        options,
-        input,
-        compileRequest,
-        output.output);
+    return compileProgram(globalSession, options, input, compileRequest, output.output);
 }
 
 } // namespace renderer_test