summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--slang.h10
-rw-r--r--source/slang/slang-compiler.h18
-rw-r--r--source/slang/slang-ir-link.cpp2
-rw-r--r--source/slang/slang-lower-to-ir.cpp2
-rw-r--r--source/slang/slang-options.cpp17
-rw-r--r--source/slang/slang-state-serialize.cpp4
-rw-r--r--source/slang/slang.cpp51
-rw-r--r--tests/serialization/serialized-module-entry-point-test.slang10
-rw-r--r--tests/serialization/serialized-module-entry-point-test.slang.expected.txt4
-rw-r--r--tests/serialization/serialized-module-entry-point.slang26
-rw-r--r--tests/serialization/serialized-module-test.slang2
-rw-r--r--tools/slang-test/slang-test-main.cpp25
12 files changed, 135 insertions, 36 deletions
diff --git a/slang.h b/slang.h
index 3766dd457..85e8b7449 100644
--- a/slang.h
+++ b/slang.h
@@ -1327,7 +1327,7 @@ extern "C"
/** Add a distinct translation unit to the compilation request
- `name` is optional.
+ `name` is optional.
Returns the zero-based index of the translation unit created.
*/
SLANG_API int spAddTranslationUnit(
@@ -1335,6 +1335,14 @@ extern "C"
SlangSourceLanguage language,
char const* name);
+
+ /** Set a default module name. Translation units will default to this module name if one is not
+ passed. If not set each translation unit will get a unique name.
+ */
+ SLANG_API void spSetDefaultModuleName(
+ SlangCompileRequest* request,
+ const char* defaultModuleName);
+
/** Add a preprocessor definition that is scoped to a single translation unit.
@param translationUnitIndex The index of the translation unit to get the definition.
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h
index cd99c4079..dd90ff7c6 100644
--- a/source/slang/slang-compiler.h
+++ b/source/slang/slang-compiler.h
@@ -1407,20 +1407,14 @@ namespace Slang
/// Add a translation unit to be compiled.
///
/// @param language The source language that the translation unit will use (e.g., `SourceLanguage::Slang`
- /// @param moduleName The name that will be used for the module compile from the translation unit.
- /// @return The zero-based index of the translation unit in this compile request.
- int addTranslationUnit(SourceLanguage language, Name* moduleName);
-
- /// Add a translation unit to be compiled.
+ /// @param moduleName The name that will be used for the module compile from the translation unit.
///
- /// @param language The source language that the translation unit will use (e.g., `SourceLanguage::Slang`
- /// @return The zero-based index of the translation unit in this compile request.
- ///
- /// The module name for the translation unit will be automatically generated.
+ /// If moduleName is passed as nullptr a module name is generated.
/// If all translation units in a compile request use automatically generated
/// module names, then they are guaranteed not to conflict with one another.
- ///
- int addTranslationUnit(SourceLanguage language);
+ ///
+ /// @return The zero-based index of the translation unit in this compile request.
+ int addTranslationUnit(SourceLanguage language, Name* moduleName);
void addTranslationUnitSourceFile(
int translationUnitIndex,
@@ -1451,6 +1445,8 @@ namespace Slang
/// Does the code we are compiling represent part of the Slang standard library?
bool m_isStandardLibraryCode = false;
+ Name* m_defaultModuleName = nullptr;
+
private:
/// A component type that includes only the global scopes of the translation unit(s) that were compiled.
RefPtr<ComponentType> m_globalComponentType;
diff --git a/source/slang/slang-ir-link.cpp b/source/slang/slang-ir-link.cpp
index 1102ecb3e..4e1a03bb2 100644
--- a/source/slang/slang-ir-link.cpp
+++ b/source/slang/slang-ir-link.cpp
@@ -806,7 +806,7 @@ IRFunc* specializeIRForEntryPoint(
SLANG_UNEXPECTED("no matching IR symbol");
return nullptr;
}
-
+
// Note: it is possible that `sym` shows multiple
// definitions, coming from different IR modules that
// were input to the linking process. We don't have
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index f040fb003..e19ab2223 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -6473,6 +6473,8 @@ static void lowerFrontEndEntryPointToIR(
}
// Go through the entry point parameters creating decorations from layout as appropriate
+ // But only if this is a definition not a declaration
+ if (isDefinition(instToDecorate))
{
FilteredMemberList<ParamDecl> params = entryPointFuncDecl->GetParameters();
diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp
index 76ebcca52..7429db2fc 100644
--- a/source/slang/slang-options.cpp
+++ b/source/slang/slang-options.cpp
@@ -497,7 +497,7 @@ struct OptionsParser
else if (argStr == "-dump-repro")
{
SLANG_RETURN_ON_FAIL(tryReadCommandLineArgument(sink, arg, &argCursor, argEnd, requestImpl->dumpRepro));
- spEnableReproCapture(asExternal(requestImpl));
+ spEnableReproCapture(compileRequest);
}
else if (argStr == "-dump-repro-on-error")
{
@@ -510,6 +510,13 @@ struct OptionsParser
SLANG_RETURN_ON_FAIL(StateSerializeUtil::extractFilesToDirectory(reproName));
}
+ else if (argStr == "-module-name")
+ {
+ String moduleName;
+ SLANG_RETURN_ON_FAIL(tryReadCommandLineArgument(sink, arg, &argCursor, argEnd, moduleName));
+
+ spSetDefaultModuleName(compileRequest, moduleName.getBuffer());
+ }
else if(argStr == "-load-repro")
{
String reproName;
@@ -860,16 +867,16 @@ struct OptionsParser
}
else if (argStr == "-r")
{
- String moduleName;
- SLANG_RETURN_ON_FAIL(tryReadCommandLineArgument(sink, arg, &argCursor, argEnd, moduleName));
+ String referenceModuleName;
+ SLANG_RETURN_ON_FAIL(tryReadCommandLineArgument(sink, arg, &argCursor, argEnd, referenceModuleName));
// We need to deserialize and add the modules
- FileStream fileStream(moduleName, FileMode::Open, FileAccess::Read, FileShare::ReadWrite);
+ FileStream fileStream(referenceModuleName, FileMode::Open, FileAccess::Read, FileShare::ReadWrite);
List<RefPtr<IRModule>> irModules;
if (SLANG_FAILED(IRSerialReader::readStreamModules(&fileStream, asInternal(session), requestImpl->getFrontEndReq()->getSourceManager(), irModules)))
{
- sink->diagnose(SourceLoc(), Diagnostics::unableToReadModuleContainer, moduleName);
+ sink->diagnose(SourceLoc(), Diagnostics::unableToReadModuleContainer, referenceModuleName);
return SLANG_FAIL;
}
diff --git a/source/slang/slang-state-serialize.cpp b/source/slang/slang-state-serialize.cpp
index e93495fdb..7bda7a377 100644
--- a/source/slang/slang-state-serialize.cpp
+++ b/source/slang/slang-state-serialize.cpp
@@ -878,7 +878,9 @@ struct LoadContext
{
const auto& srcTranslationUnit = base.asRaw(srcTranslationUnits[i]);
- int index = frontEndReq->addTranslationUnit(srcTranslationUnit.language);
+ // TODO(JS): We should probably serialize off the module name
+ // Passing in nullptr will just generate the module name
+ int index = frontEndReq->addTranslationUnit(srcTranslationUnit.language, nullptr);
SLANG_UNUSED(index);
SLANG_ASSERT(index == i);
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index ed0e87045..c7171d835 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -1348,6 +1348,18 @@ int FrontEndCompileRequest::addTranslationUnit(SourceLanguage language, Name* mo
{
Index result = translationUnits.getCount();
+ if (!moduleName)
+ {
+ // We want to ensure that symbols defined in different translation
+ // units get unique mangled names, so that we can, e.g., tell apart
+ // a `main()` function in `vertex.slang` and a `main()` in `fragment.slang`,
+ // even when they are being compiled together.
+ //
+ String generatedName = "tu";
+ generatedName.append(translationUnits.getCount());
+ moduleName = getNamePool()->getName(generatedName);
+ }
+
RefPtr<TranslationUnitRequest> translationUnit = new TranslationUnitRequest(this);
translationUnit->compileRequest = this;
translationUnit->sourceLanguage = SourceLanguage(language);
@@ -1359,18 +1371,6 @@ int FrontEndCompileRequest::addTranslationUnit(SourceLanguage language, Name* mo
return (int) result;
}
-int FrontEndCompileRequest::addTranslationUnit(SourceLanguage language)
-{
- // We want to ensure that symbols defined in different translation
- // units get unique mangled names, so that we can, e.g., tell apart
- // a `main()` function in `vertex.slang` and a `main()` in `fragment.slang`,
- // even when they are being compiled together.
- //
- String generatedName = "tu";
- generatedName.append(translationUnits.getCount());
- return addTranslationUnit(language, getNamePool()->getName(generatedName));
-}
-
void FrontEndCompileRequest::addTranslationUnitSourceFile(
int translationUnitIndex,
SourceFile* sourceFile)
@@ -3009,17 +3009,36 @@ SLANG_API SlangResult spGetDiagnosticOutputBlob(
SLANG_API int spAddTranslationUnit(
SlangCompileRequest* request,
SlangSourceLanguage language,
- char const* name)
+ char const* inName)
{
- SLANG_UNUSED(name);
-
auto req = Slang::asInternal(request);
auto frontEndReq = req->getFrontEndReq();
+ Slang::NamePool* namePool = req->getFrontEndReq()->getNamePool();
+
+ // Work out a module name. Can be nullptr if so will generate a name
+ Slang::Name* moduleName = inName ? namePool->getName(inName) : frontEndReq->m_defaultModuleName;
+
+ // If moduleName is nullptr a name will be generated
+
return frontEndReq->addTranslationUnit(
- Slang::SourceLanguage(language));
+ Slang::SourceLanguage(language),
+ moduleName);
+}
+
+SLANG_API void spSetDefaultModuleName(
+ SlangCompileRequest* request,
+ const char* defaultModuleName)
+{
+ auto req = Slang::asInternal(request);
+ auto frontEndReq = req->getFrontEndReq();
+
+ Slang::NamePool* namePool = req->getFrontEndReq()->getNamePool();
+
+ frontEndReq->m_defaultModuleName = namePool->getName(defaultModuleName);
}
+
SLANG_API void spTranslationUnit_addPreprocessorDefine(
SlangCompileRequest* request,
int translationUnitIndex,
diff --git a/tests/serialization/serialized-module-entry-point-test.slang b/tests/serialization/serialized-module-entry-point-test.slang
new file mode 100644
index 000000000..51bc8a57f
--- /dev/null
+++ b/tests/serialization/serialized-module-entry-point-test.slang
@@ -0,0 +1,10 @@
+// serialized-module-entry-point-test.slang
+
+//TEST:COMPILE: -module-name module -target hlsl -profile cs_5_0 -entry computeMain tests/serialization/serialized-module-entry-point.slang -o tests/serialization/serialized-module-entry-point.slang-module
+//TEST:COMPILE: -module-name module tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module
+//TEST:COMPARE_COMPUTE_EX: -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/serialized-module-entry-point.slang-module -xslang -r -xslang tests/serialization/serialized-module.slang-module
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0 ], stride=4):dxbinding(0),glbinding(0),out,name outputBuffer
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID); \ No newline at end of file
diff --git a/tests/serialization/serialized-module-entry-point-test.slang.expected.txt b/tests/serialization/serialized-module-entry-point-test.slang.expected.txt
new file mode 100644
index 000000000..bc856dafa
--- /dev/null
+++ b/tests/serialization/serialized-module-entry-point-test.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+1
+2
+3
diff --git a/tests/serialization/serialized-module-entry-point.slang b/tests/serialization/serialized-module-entry-point.slang
new file mode 100644
index 000000000..412a67ce6
--- /dev/null
+++ b/tests/serialization/serialized-module-entry-point.slang
@@ -0,0 +1,26 @@
+//TEST_IGNORE_FILE:
+
+// serialized-module-entry-point.slang
+
+struct Thing
+{
+ int a;
+ int b;
+};
+
+int foo(Thing thing);
+
+RWStructuredBuffer<int> outputBuffer;
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+ Thing thing;
+
+ int index = (int)dispatchThreadID.x;
+
+ thing.a = index;
+ thing.b = -index;
+
+ outputBuffer[index] = foo(thing);
+}
diff --git a/tests/serialization/serialized-module-test.slang b/tests/serialization/serialized-module-test.slang
index 63c31e039..b3f1d2149 100644
--- a/tests/serialization/serialized-module-test.slang
+++ b/tests/serialization/serialized-module-test.slang
@@ -3,7 +3,7 @@
// A test to try out the basics of module
// serialization.
-//TEST:SIMPLE_EX: tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module
+//TEST:COMPILE: tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module
//TEST:COMPARE_COMPUTE_EX:-slang -compute -xslang -r -xslang tests/serialization/serialized-module.slang-module
//import serialized_module;
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 79e810224..2000bf617 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1086,6 +1086,30 @@ TestResult runSimpleTest(TestContext* context, TestInput& input)
return result;
}
+TestResult runCompile(TestContext* context, TestInput& input)
+{
+ // need to execute the stand-alone Slang compiler on the file, and compare its output to what we expect
+ auto outputStem = input.outputStem;
+
+ CommandLine cmdLine;
+ _initSlangCompiler(context, cmdLine);
+
+ for (auto arg : input.testOptions->args)
+ {
+ cmdLine.addArg(arg);
+ }
+
+ ExecuteResult exeRes;
+ TEST_RETURN_ON_DONE(spawnAndWait(context, outputStem, input.spawnType, cmdLine, exeRes));
+ if (context->isCollectingRequirements())
+ {
+ return TestResult::Pass;
+ }
+
+ return TestResult::Pass;
+}
+
+
static SlangResult _loadAsSharedLibrary(const UnownedStringSlice& hexDump, TemporaryFileSet& inOutTemporaryFileSet, SharedLibrary::Handle& outSharedLibrary)
{
// We need to extract the binary
@@ -2406,6 +2430,7 @@ static const TestCommandInfo s_testCommandInfos[] =
{ "CPP_COMPILER_SHARED_LIBRARY", &runCPPCompilerSharedLibrary},
{ "CPP_COMPILER_COMPILE", &runCPPCompilerCompile},
{ "PERFORMANCE_PROFILE", &runPerformanceProfile},
+ { "COMPILE", &runCompile},
};
TestResult runTest(
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 16:19:53 +0000