summaryrefslogtreecommitdiffstats
path: root/source/slang
diff options
context:
space:
mode:
authorDietrich Geisler <dag368@cornell.edu>2020-08-12 13:39:08 -0400
committerGitHub <noreply@github.com>2020-08-12 10:39:08 -0700
commite1ea7ed2f9b8cfcf19258a05d270de4db03fec22 (patch)
treeda87da6f4dd8adb39a44b0bfae342ed1dba04b58 /source/slang
parent12b0fc64103c63c33daaedf8a8c2ee05de35dcc5 (diff)
GPU Foreach Parsing and Checking (#1482)
This PR introduces parsing and semantic checking for a GPU foreach loop for heterogeneouis programming. A GPU foreach loop takes the form: ``` __GPU_FOREACH(renderer, gridDims, LAMBDA(uint3 dispatchThreadID) { kernelCall(args, ...); }); ``` And will allow the host code to call into a kernel with the correct renderer and grid dimensions. This commit also introduces a hack to unify types in the heterogeneous hello world file, which will hopefully be amended in the future. Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
Diffstat (limited to 'source/slang')
-rw-r--r--source/slang/slang-ast-stmt.h11
-rw-r--r--source/slang/slang-check-impl.h2
-rw-r--r--source/slang/slang-check-stmt.cpp9
-rw-r--r--source/slang/slang-lower-to-ir.cpp6
-rw-r--r--source/slang/slang-parser.cpp52
5 files changed, 80 insertions, 0 deletions
diff --git a/source/slang/slang-ast-stmt.h b/source/slang/slang-ast-stmt.h
index e9e5ea4f3..2fb10db1f 100644
--- a/source/slang/slang-ast-stmt.h
+++ b/source/slang/slang-ast-stmt.h
@@ -117,6 +117,17 @@ class DefaultStmt : public CaseStmtBase
SLANG_CLASS(DefaultStmt)
};
+// a `default` statement inside a `switch`
+class GpuForeachStmt : public ScopeStmt
+{
+ SLANG_CLASS(GpuForeachStmt)
+
+ Expr* renderer = nullptr;
+ Expr* gridDims = nullptr;
+ VarDecl* dispatchThreadID = nullptr;
+ Expr* kernelCall = nullptr;
+};
+
// A statement that represents a loop, and can thus be escaped with a `continue`
class LoopStmt : public BreakableStmt
{
diff --git a/source/slang/slang-check-impl.h b/source/slang/slang-check-impl.h
index 97e77ec3e..19f5553c7 100644
--- a/source/slang/slang-check-impl.h
+++ b/source/slang/slang-check-impl.h
@@ -1596,6 +1596,8 @@ namespace Slang
void visitReturnStmt(ReturnStmt *stmt);
void visitWhileStmt(WhileStmt *stmt);
+
+ void visitGpuForeachStmt(GpuForeachStmt *stmt);
void visitExpressionStmt(ExpressionStmt *stmt);
};
diff --git a/source/slang/slang-check-stmt.cpp b/source/slang/slang-check-stmt.cpp
index 2d01086f1..9a5aee15c 100644
--- a/source/slang/slang-check-stmt.cpp
+++ b/source/slang/slang-check-stmt.cpp
@@ -288,4 +288,13 @@ namespace Slang
stmt->expression = CheckExpr(stmt->expression);
}
+ void SemanticsStmtVisitor::visitGpuForeachStmt(GpuForeachStmt*stmt)
+ {
+ stmt->renderer = CheckExpr(stmt->renderer);
+ stmt->gridDims = CheckExpr(stmt->gridDims);
+ ensureDeclBase(stmt->dispatchThreadID, DeclCheckState::Checked);
+ WithOuterStmt subContext(this, stmt);
+ stmt->kernelCall = subContext.CheckExpr(stmt->kernelCall);
+ return;
+ }
}
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index a4542647a..9c4808f31 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -4114,6 +4114,12 @@ struct StmtLoweringVisitor : StmtVisitor<StmtLoweringVisitor>
insertBlock(breakLabel);
}
+ void visitGpuForeachStmt(GpuForeachStmt* stmt)
+ {
+ startBlockIfNeeded(stmt);
+ return;
+ }
+
void visitExpressionStmt(ExpressionStmt* stmt)
{
startBlockIfNeeded(stmt);
diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
index 460f781fe..179587550 100644
--- a/source/slang/slang-parser.cpp
+++ b/source/slang/slang-parser.cpp
@@ -3380,6 +3380,56 @@ namespace Slang
return stmt;
}
+ GpuForeachStmt* ParseGpuForeachStmt(Parser* parser)
+ {
+ // Hard-coding parsing of the following:
+ // __GPU_FOREACH(renderer, gridDims, LAMBDA(uint3 dispatchThreadID) {
+ // kernelCall(args, ...); });
+
+ // Setup the scope so that dispatchThreadID is in scope for kernelCall
+ ScopeDecl* scopeDecl = parser->astBuilder->create<ScopeDecl>();
+ GpuForeachStmt* stmt = parser->astBuilder->create<GpuForeachStmt>();
+ stmt->scopeDecl = scopeDecl;
+
+ parser->FillPosition(stmt);
+ parser->ReadToken("__GPU_FOREACH");
+ parser->ReadToken(TokenType::LParent);
+ stmt->renderer = parser->ParseArgExpr();
+ parser->ReadToken(TokenType::Comma);
+ stmt->gridDims = parser->ParseArgExpr();
+
+ parser->ReadToken(TokenType::Comma);
+ parser->ReadToken("LAMBDA");
+ parser->ReadToken(TokenType::LParent);
+
+ auto idType = parser->ParseTypeExp();
+ NameLoc varNameAndLoc = expectIdentifier(parser);
+ VarDecl* varDecl = parser->astBuilder->create<VarDecl>();
+ varDecl->nameAndLoc = varNameAndLoc;
+ varDecl->loc = varNameAndLoc.loc;
+ varDecl->type = idType;
+ stmt->dispatchThreadID = varDecl;
+
+ parser->ReadToken(TokenType::RParent);
+ parser->ReadToken(TokenType::LBrace);
+
+ parser->pushScopeAndSetParent(scopeDecl);
+ AddMember(parser->currentScope, varDecl);
+
+ stmt->kernelCall = parser->ParseExpression();
+
+ parser->PopScope();
+
+ parser->ReadToken(TokenType::Semicolon);
+ parser->ReadToken(TokenType::RBrace);
+
+ parser->ReadToken(TokenType::RParent);
+
+ parser->ReadToken(TokenType::Semicolon);
+
+ return stmt;
+ }
+
static bool _isType(Decl* decl)
{
return decl && (as<AggTypeDecl>(decl) || as<SimpleTypeDecl>(decl));
@@ -3552,6 +3602,8 @@ namespace Slang
statement = ParseCaseStmt(this);
else if (LookAheadToken("default"))
statement = ParseDefaultStmt(this);
+ else if (LookAheadToken("__GPU_FOREACH"))
+ statement = ParseGpuForeachStmt(this);
else if (LookAheadToken(TokenType::Dollar))
{
statement = parseCompileTimeStmt(this);