summaryrefslogtreecommitdiffstats
path: root/source/slang
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang')
-rw-r--r--source/slang/compiler.cpp22
-rw-r--r--source/slang/compiler.h20
-rw-r--r--source/slang/diagnostic-defs.h2
-rw-r--r--source/slang/dxc-support.cpp22
-rw-r--r--source/slang/options.cpp45
-rw-r--r--source/slang/slang.cpp24
6 files changed, 135 insertions, 0 deletions
diff --git a/source/slang/compiler.cpp b/source/slang/compiler.cpp
index bc4152244..1222d91d2 100644
--- a/source/slang/compiler.cpp
+++ b/source/slang/compiler.cpp
@@ -746,6 +746,28 @@ namespace Slang
flags |= D3DCOMPILE_ENABLE_STRICTNESS;
flags |= D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES;
+ auto linkage = compileRequest->getLinkage();
+ switch( linkage->optimizationLevel )
+ {
+ default:
+ break;
+
+ case OptimizationLevel::None: flags |= D3DCOMPILE_OPTIMIZATION_LEVEL0; break;
+ case OptimizationLevel::Default: flags |= D3DCOMPILE_OPTIMIZATION_LEVEL1; break;
+ case OptimizationLevel::High: flags |= D3DCOMPILE_OPTIMIZATION_LEVEL2; break;
+ case OptimizationLevel::Maximal: flags |= D3DCOMPILE_OPTIMIZATION_LEVEL3; break;
+ }
+
+ switch( linkage->debugInfoLevel )
+ {
+ case DebugInfoLevel::None:
+ break;
+
+ default:
+ flags |= D3DCOMPILE_DEBUG;
+ break;
+ }
+
const String sourcePath = calcSourcePathForEntryPoint(endToEndReq, entryPointIndex);
ComPtr<ID3DBlob> codeBlob;
diff --git a/source/slang/compiler.h b/source/slang/compiler.h
index 71cd0adbf..a0568a047 100644
--- a/source/slang/compiler.h
+++ b/source/slang/compiler.h
@@ -89,6 +89,22 @@ namespace Slang
kMatrixLayoutMode_ColumnMajor = SLANG_MATRIX_LAYOUT_COLUMN_MAJOR,
};
+ enum class DebugInfoLevel : SlangDebugInfoLevel
+ {
+ None = SLANG_DEBUG_INFO_LEVEL_NONE,
+ Minimal = SLANG_DEBUG_INFO_LEVEL_MINIMAL,
+ Standard = SLANG_DEBUG_INFO_LEVEL_STANDARD,
+ Maximal = SLANG_DEBUG_INFO_LEVEL_MAXIMAL,
+ };
+
+ enum class OptimizationLevel : SlangOptimizationLevel
+ {
+ None = SLANG_OPTIMIZATION_LEVEL_NONE,
+ Default = SLANG_OPTIMIZATION_LEVEL_DEFAULT,
+ High = SLANG_OPTIMIZATION_LEVEL_HIGH,
+ Maximal = SLANG_OPTIMIZATION_LEVEL_MAXIMAL,
+ };
+
class Linkage;
class Module;
class Program;
@@ -697,6 +713,10 @@ namespace Slang
MatrixLayoutMode defaultMatrixLayoutMode = kMatrixLayoutMode_ColumnMajor;
MatrixLayoutMode getDefaultMatrixLayoutMode() { return defaultMatrixLayoutMode; }
+ DebugInfoLevel debugInfoLevel = DebugInfoLevel::None;
+
+ OptimizationLevel optimizationLevel = OptimizationLevel::Default;
+
private:
Session* m_session = nullptr;
diff --git a/source/slang/diagnostic-defs.h b/source/slang/diagnostic-defs.h
index c773cc4ed..3947d8b19 100644
--- a/source/slang/diagnostic-defs.h
+++ b/source/slang/diagnostic-defs.h
@@ -74,6 +74,8 @@ DIAGNOSTIC( 21, Error, expectedArgumentForOption, "expected an argument for c
DIAGNOSTIC( 24, Error, unknownLineDirectiveMode, "unknown '#line' directive mode '$0'");
DIAGNOSTIC( 25, Error, unknownFloatingPointMode, "unknown floating-point mode '$0'");
+DIAGNOSTIC( 26, Error, unknownOptimiziationLevel, "unknown optimization level '$0'");
+DIAGNOSTIC( 27, Error, uknownDebugInfoLevel, "unknown debug info level '$0'");
DIAGNOSTIC( 30, Warning, sameStageSpecifiedMoreThanOnce, "the stage '$0' was specified more than once for entry point '$1'")
DIAGNOSTIC( 31, Error, conflictingStagesForEntryPoint, "conflicting stages have been specified for entry point '$0'")
diff --git a/source/slang/dxc-support.cpp b/source/slang/dxc-support.cpp
index 603a59ea7..cab94e74b 100644
--- a/source/slang/dxc-support.cpp
+++ b/source/slang/dxc-support.cpp
@@ -141,6 +141,28 @@ namespace Slang
break;
}
+ auto linkage = compileRequest->getLinkage();
+ switch( linkage->optimizationLevel )
+ {
+ default:
+ break;
+
+ case OptimizationLevel::None: args[argCount++] = L"-Od"; break;
+ case OptimizationLevel::Default: args[argCount++] = L"-O1"; break;
+ case OptimizationLevel::High: args[argCount++] = L"-O2"; break;
+ case OptimizationLevel::Maximal: args[argCount++] = L"-O3"; break;
+ }
+
+ switch( linkage->debugInfoLevel )
+ {
+ case DebugInfoLevel::None:
+ break;
+
+ default:
+ args[argCount++] = L"-Zi";
+ break;
+ }
+
// Slang strives to produce correct code, and by default
// we do not show the user warnings produced by a downstream
// compiler. When the downstream compiler *does* produce an
diff --git a/source/slang/options.cpp b/source/slang/options.cpp
index 65fbfe068..a7334f13b 100644
--- a/source/slang/options.cpp
+++ b/source/slang/options.cpp
@@ -727,6 +727,51 @@ struct OptionsParser
setFloatingPointMode(getCurrentTarget(), mode);
}
+ else if( argStr[1] == 'O' )
+ {
+ char const* name = arg + 2;
+ SlangOptimizationLevel level = SLANG_OPTIMIZATION_LEVEL_DEFAULT;
+
+ bool invalidOptimizationLevel = strlen(name) > 2;
+ switch( name[0] )
+ {
+ case '0': level = SLANG_OPTIMIZATION_LEVEL_NONE; break;
+ case '1': level = SLANG_OPTIMIZATION_LEVEL_DEFAULT; break;
+ case '2': level = SLANG_OPTIMIZATION_LEVEL_HIGH; break;
+ case '3': level = SLANG_OPTIMIZATION_LEVEL_MAXIMAL; break;
+ case 0 : level = SLANG_OPTIMIZATION_LEVEL_DEFAULT; break;
+ default:
+ invalidOptimizationLevel = true;
+ break;
+ }
+ if( invalidOptimizationLevel )
+ {
+ sink->diagnose(SourceLoc(), Diagnostics::unknownOptimiziationLevel, name);
+ return SLANG_FAIL;
+ }
+
+ spSetOptimizationLevel(compileRequest, level);
+ }
+
+ // Note: unlike with `-O` above, we have to consider that other
+ // options might have names that start with `-g` and so cannot
+ // just detect it as a prefix.
+ else if( argStr == "-g" || argStr == "-g2" )
+ {
+ spSetDebugInfoLevel(compileRequest, SLANG_DEBUG_INFO_LEVEL_STANDARD);
+ }
+ else if( argStr == "-g0" )
+ {
+ spSetDebugInfoLevel(compileRequest, SLANG_DEBUG_INFO_LEVEL_NONE);
+ }
+ else if( argStr == "-g1" )
+ {
+ spSetDebugInfoLevel(compileRequest, SLANG_DEBUG_INFO_LEVEL_MINIMAL);
+ }
+ else if( argStr == "-g3" )
+ {
+ spSetDebugInfoLevel(compileRequest, SLANG_DEBUG_INFO_LEVEL_MAXIMAL);
+ }
else if (argStr == "--")
{
// The `--` option causes us to stop trying to parse options,
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index e97f5bb1b..affce384b 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -1831,6 +1831,30 @@ SLANG_API void spSetTargetMatrixLayoutMode(
spSetMatrixLayoutMode(request, mode);
}
+/*!
+@brief Set the level of debug information to produce.
+*/
+SLANG_API void spSetDebugInfoLevel(
+ SlangCompileRequest* request,
+ SlangDebugInfoLevel level)
+{
+ auto req = convert(request);
+ auto linkage = req->getLinkage();
+ linkage->debugInfoLevel = Slang::DebugInfoLevel(level);
+}
+
+/*!
+@brief Set the level of optimization to perform.
+*/
+SLANG_API void spSetOptimizationLevel(
+ SlangCompileRequest* request,
+ SlangOptimizationLevel level)
+{
+ auto req = convert(request);
+ auto linkage = req->getLinkage();
+ linkage->optimizationLevel = Slang::OptimizationLevel(level);
+}
+
SLANG_API void spSetOutputContainerFormat(
SlangCompileRequest* request,
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 21:15:53 +0000