Skip to content

Commit ff2d490

Browse files
Checkmate50Tim Foley
Checkmate50
and
Tim Foley
authored
GPU Foreach Loop (shader-slang#1498)
* GPU Foreach Loop This PR introduces the completed GPU foreach loop and updates the heterogeneous-hello-world example to use it. This PR builds on the previous introduction of the GPU Foreach loop parsing and semantic checking PR (shader-slang#1482) by introducing IR lowering and emmitting. THe new feature can be used by having a GPU_Foreach loop interacting with a named non-CPP entry point, and using the -heterogeneous flag. * Fix to path Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
1 parent 0640a10 commit ff2d490

11 files changed

+190
-129
lines changed

‎examples/heterogeneous-hello-world/main.cpp

+25-10
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,11 @@ bool executeComputation_0();
6666
extern unsigned char __computeMain[];
6767
extern size_t __computeMainSize;
6868

69-
gfx::ShaderProgram* loadShaderProgram(gfx::Renderer* renderer)
69+
gfx::ShaderProgram* loadShaderProgram(gfx::Renderer* renderer, unsigned char computeCode[], size_t computeCodeSize)
7070
{
7171
// We extract the begin/end pointers to the output code buffers directly
7272
//
73-
char unsigned const* computeCode = __computeMain;
74-
char unsigned const* computeCodeEnd = computeCode + __computeMainSize;
73+
char unsigned const* computeCodeEnd = computeCode + computeCodeSize;
7574

7675
// Now we use the operations of the example graphics API abstraction
7776
// layer to load shader code into the underlying API.
@@ -87,7 +86,7 @@ gfx::ShaderProgram* loadShaderProgram(gfx::Renderer* renderer)
8786
gfx::ShaderProgram::Desc programDesc;
8887
programDesc.pipelineType = gfx::PipelineType::Compute;
8988
programDesc.kernels = &kernelDescs[0];
90-
programDesc.kernelCount = 2;
89+
programDesc.kernelCount = 1;
9190

9291
gShaderProgram = renderer->createProgram(programDesc);
9392

@@ -242,13 +241,16 @@ void dispatchComputation(
242241
gfx::Renderer* gRenderer,
243242
gfx::PipelineState* gPipelineState,
244243
gfx::PipelineLayout* gPipelineLayout,
245-
gfx::DescriptorSet* gDescriptorSet)
244+
gfx::DescriptorSet* gDescriptorSet,
245+
unsigned int gridDimsX,
246+
unsigned int gridDimsY,
247+
unsigned int gridDimsZ)
246248
{
247249

248250
gRenderer->setPipelineState(PipelineType::Compute, gPipelineState);
249251
gRenderer->setDescriptorSet(PipelineType::Compute, gPipelineLayout, 0, gDescriptorSet);
250252

251-
gRenderer->dispatchCompute(4, 1, 1);
253+
gRenderer->dispatchCompute(gridDimsX, gridDimsY, gridDimsZ);
252254
}
253255

254256
void print_output(
@@ -286,9 +288,9 @@ gfx_BufferResource_0* createStructuredBuffer_0(gfx_Renderer_0* _0, FixedArray<fl
286288
return (gfx_BufferResource_0*)createStructuredBuffer((gfx::Renderer*)_0, (float*)&_1);
287289
}
288290

289-
gfx_ShaderProgram_0* loadShaderProgram_0(gfx_Renderer_0* _0)
291+
gfx_ShaderProgram_0* loadShaderProgram_0(gfx_Renderer_0* _0, unsigned char _1[], size_t _2)
290292
{
291-
return (gfx_ShaderProgram_0*)loadShaderProgram((gfx::Renderer*)_0);
293+
return (gfx_ShaderProgram_0*)loadShaderProgram((gfx::Renderer*)_0, _1, _2);
292294
}
293295

294296
gfx_DescriptorSetLayout_0* buildDescriptorSetLayout_0(gfx_Renderer_0* _0)
@@ -322,13 +324,26 @@ void printInitialValues_0(FixedArray<float, 4> _0, int32_t _1)
322324
printInitialValues((float*)&_0, _1);
323325
}
324326

325-
void dispatchComputation_0(gfx_Renderer_0* _0, gfx_PipelineState_0* _1, gfx_PipelineLayout_0* _2, gfx_DescriptorSet_0* _3)
327+
void dispatchComputation_0(gfx_Renderer_0* _0, gfx_PipelineState_0* _1, gfx_PipelineLayout_0* _2, gfx_DescriptorSet_0* _3, unsigned int gridDimsX, unsigned int gridDimsY, unsigned int gridDimsZ)
326328
{
327329
dispatchComputation(
328330
(gfx::Renderer*)_0,
329331
(gfx::PipelineState*)_1,
330332
(gfx::PipelineLayout*)_2,
331-
(gfx::DescriptorSet*)_3);
333+
(gfx::DescriptorSet*)_3,
334+
gridDimsX,
335+
gridDimsY,
336+
gridDimsZ);
337+
}
338+
339+
RWStructuredBuffer<float> convertBuffer_0(gfx_BufferResource_0* _0) {
340+
RWStructuredBuffer<float> result;
341+
result.data = (float*)_0;
342+
return result;
343+
}
344+
345+
gfx_BufferResource_0* unconvertBuffer_0(RWStructuredBuffer<float> _0) {
346+
return (gfx_BufferResource_0*)(_0.data);
332347
}
333348

334349
void print_output_0(gfx_Renderer_0* _0, gfx_BufferResource_0* _1, int32_t _2)

‎examples/heterogeneous-hello-world/shader.cpp

+36-80
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
#include "../../slang/prelude/slang-cpp-prelude.h"
1+
#include "../../prelude/slang-cpp-prelude.h"
22

33

4-
//namespace { // anonymous
5-
64
#ifdef SLANG_PRELUDE_NAMESPACE
75
using namespace SLANG_PRELUDE_NAMESPACE;
86
#endif
97

10-
Vector<uint32_t, 3> operator+(Vector<uint32_t, 3> a, Vector<uint32_t, 3> b)
8+
Vector<uint32_t, 3> operator*(Vector<uint32_t, 3> a, Vector<uint32_t, 3> b)
119
{
1210
Vector<uint32_t, 3> r;
13-
r.x = a.x + b.x;
14-
r.y = a.y + b.y;
15-
r.z = a.z + b.z;
11+
r.x = a.x * b.x;
12+
r.y = a.y * b.y;
13+
r.z = a.z * b.z;
1614
return r;
1715
}
1816

19-
Vector<uint32_t, 3> operator*(Vector<uint32_t, 3> a, Vector<uint32_t, 3> b)
17+
Vector<uint32_t, 3> operator+(Vector<uint32_t, 3> a, Vector<uint32_t, 3> b)
2018
{
2119
Vector<uint32_t, 3> r;
22-
r.x = a.x * b.x;
23-
r.y = a.y * b.y;
24-
r.z = a.z * b.z;
20+
r.x = a.x + b.x;
21+
r.y = a.y + b.y;
22+
r.z = a.z + b.z;
2523
return r;
2624
}
2725

@@ -30,20 +28,31 @@ Vector<uint32_t, 3> make_VecU3(uint32_t a, uint32_t b, uint32_t c)
3028
return Vector<uint32_t, 3>{ a, b, c};
3129
}
3230

33-
size_t __computeMainSize = 652;
34-
unsigned char __computeMain[] = {68, 88, 66, 67, 85, 217, 21, 44, 5, 208, 4, 46, 7, 254, 139, 84, 132, 65, 108, 79, 1, 0, 0, 0, 140, 2, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 248, 0, 0, 0, 8, 1, 0, 0, 24, 1, 0, 0, 16, 2, 0, 0, 82, 68, 69, 70, 188, 0, 0, 0, 1, 0, 0, 0, 72, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0, 0, 4, 83, 67, 0, 9, 16, 0, 148, 0, 0, 0, 60, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 105, 111, 66, 117, 102, 102, 101, 114, 95, 48, 0, 171, 60, 0, 0, 0, 1, 0, 0, 0, 96, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 120, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 2, 0, 0, 0, 132, 0, 0, 0, 0, 0, 0, 0, 36, 69, 108, 101, 109, 101, 110, 116, 0, 171, 171, 171, 0, 0, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 105, 99, 114, 111, 115, 111, 102, 116, 32, 40, 82, 41, 32, 72, 76, 83, 76, 32, 83, 104, 97, 100, 101, 114, 32, 67, 111, 109, 112, 105, 108, 101, 114, 32, 49, 48, 46, 49, 0, 73, 83, 71, 78, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 79, 83, 71, 78, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 83, 72, 69, 88, 240, 0, 0, 0, 64, 0, 5, 0, 60, 0, 0, 0, 106, 8, 0, 1, 158, 0, 0, 4, 0, 224, 17, 0, 0, 0, 0, 0, 4, 0, 0, 0, 95, 0, 0, 2, 18, 0, 2, 0, 104, 0, 0, 2, 1, 0, 0, 0, 155, 0, 0, 4, 4, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 167, 0, 0, 8, 18, 0, 16, 0, 0, 0, 0, 0, 10, 0, 2, 0, 1, 64, 0, 0, 0, 0, 0, 0, 6, 224, 17, 0, 0, 0, 0, 0, 49, 0, 0, 7, 34, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 63, 0, 0, 0, 7, 66, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 75, 0, 0, 5, 18, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 55, 0, 0, 9, 18, 0, 16, 0, 0, 0, 0, 0, 26, 0, 16, 0, 0, 0, 0, 0, 42, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 168, 0, 0, 8, 18, 224, 17, 0, 0, 0, 0, 0, 10, 0, 2, 0, 1, 64, 0, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, 83, 84, 65, 84, 116, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
31+
size_t __computeMainSize = 668;
32+
unsigned char __computeMain[] = {68, 88, 66, 67, 87, 111, 81, 164, 2, 29, 72, 42, 151, 28, 13, 217, 55, 37, 7, 95, 1, 0, 0, 0, 156, 2, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 8, 1, 0, 0, 24, 1, 0, 0, 40, 1, 0, 0, 32, 2, 0, 0, 82, 68, 69, 70, 204, 0, 0, 0, 1, 0, 0, 0, 88, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0, 0, 4, 83, 67, 0, 9, 16, 0, 164, 0, 0, 0, 60, 0, 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 101, 110, 116, 114, 121, 80, 111, 105, 110, 116, 80, 97, 114, 97, 109, 115, 95, 105, 111, 66, 117, 102, 102, 101, 114, 95, 48, 0, 60, 0, 0, 0, 1, 0, 0, 0, 112, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 136, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 2, 0, 0, 0, 148, 0, 0, 0, 0, 0, 0, 0, 36, 69, 108, 101, 109, 101, 110, 116, 0, 171, 171, 171, 0, 0, 3, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 105, 99, 114, 111, 115, 111, 102, 116, 32, 40, 82, 41, 32, 72, 76, 83, 76, 32, 83, 104, 97, 100, 101, 114, 32, 67, 111, 109, 112, 105, 108, 101, 114, 32, 49, 48, 46, 49, 0, 73, 83, 71, 78, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 79, 83, 71, 78, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 83, 72, 69, 88, 240, 0, 0, 0, 64, 0, 5, 0, 60, 0, 0, 0, 106, 8, 0, 1, 158, 0, 0, 4, 0, 224, 17, 0, 0, 0, 0, 0, 4, 0, 0, 0, 95, 0, 0, 2, 18, 0, 2, 0, 104, 0, 0, 2, 1, 0, 0, 0, 155, 0, 0, 4, 4, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 167, 0, 0, 8, 18, 0, 16, 0, 0, 0, 0, 0, 10, 0, 2, 0, 1, 64, 0, 0, 0, 0, 0, 0, 6, 224, 17, 0, 0, 0, 0, 0, 49, 0, 0, 7, 34, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 63, 0, 0, 0, 7, 66, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 75, 0, 0, 5, 18, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 55, 0, 0, 9, 18, 0, 16, 0, 0, 0, 0, 0, 26, 0, 16, 0, 0, 0, 0, 0, 42, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 168, 0, 0, 8, 18, 224, 17, 0, 0, 0, 0, 0, 10, 0, 2, 0, 1, 64, 0, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, 83, 84, 65, 84, 116, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
33+
void computeMain_wrapper(gfx_Renderer_0* renderer, Vector<uint32_t, 3> gridDims,
34+
RWStructuredBuffer<float> buffer)
35+
{
36+
gfx_ShaderProgram_0* shaderProgram = loadShaderProgram_0(renderer, __computeMain, __computeMainSize);
37+
gfx_DescriptorSetLayout_0* setLayout = buildDescriptorSetLayout_0(renderer);
38+
gfx_PipelineLayout_0* pipelineLayout = buildPipeline_0(renderer, setLayout);
39+
gfx_DescriptorSet_0* descriptorSet = buildDescriptorSet_0(renderer, setLayout, unconvertBuffer_0(buffer));
40+
gfx_PipelineState_0* pipelineState = buildPipelineState_0(shaderProgram, renderer, pipelineLayout);
41+
dispatchComputation_0(renderer, pipelineState, pipelineLayout, descriptorSet, gridDims.x, gridDims.y, gridDims.z);
42+
}
3543

36-
#line 11 "shader.slang"
37-
struct GlobalParams_0
44+
#line 7 "../../examples/heterogeneous-hello-world/shader.slang"
45+
struct EntryPointParams_0
3846
{
3947
RWStructuredBuffer<float> ioBuffer_0;
4048
};
4149

4250
struct KernelContext_0
4351
{
44-
GlobalParams_0* globalParams_0;
4552
};
4653

54+
55+
#line 21
4756
struct gfx_Window_0
4857
{
4958
};
@@ -61,46 +70,16 @@ struct gfx_BufferResource_0
6170
};
6271

6372

64-
struct gfx_ShaderProgram_0
65-
{
66-
};
67-
68-
69-
#line 26
70-
struct gfx_DescriptorSetLayout_0
71-
{
72-
};
73-
74-
75-
#line 24
76-
struct gfx_PipelineLayout_0
77-
{
78-
};
79-
80-
81-
#line 27
82-
struct gfx_DescriptorSet_0
83-
{
84-
};
85-
86-
87-
#line 25
88-
struct gfx_PipelineState_0
89-
{
90-
};
91-
92-
9373
#line 7
9474
void _computeMain(void* _S1, void* entryPointParams_0, void* _S2)
9575
{
9676
ComputeThreadVaryingInput* _S3 = ((ComputeThreadVaryingInput*)(_S1));
9777
KernelContext_0 kernelContext_0;
98-
*(&(&kernelContext_0)->globalParams_0) = ((GlobalParams_0*)(_S2));
9978

10079
#line 9
10180
uint32_t tid_0 = (*(&_S3->groupID) * make_VecU3(4U, 1U, 1U) + *(&_S3->groupThreadID)).x;
10281

103-
float* _S4 = &(*(&(*(&(&kernelContext_0)->globalParams_0))->ioBuffer_0))[tid_0];
82+
float* _S4 = &(*(&((EntryPointParams_0*)(entryPointParams_0))->ioBuffer_0))[tid_0];
10483

10584
#line 11
10685
float i_0 = *_S4;
@@ -115,7 +94,7 @@ void _computeMain(void* _S1, void* entryPointParams_0, void* _S2)
11594
#line 12
11695
float o_0 = _S5 ? _S6 : _S7;
11796

118-
float* _S8 = &(*(&(*(&(&kernelContext_0)->globalParams_0))->ioBuffer_0))[tid_0];
97+
float* _S8 = &(*(&((EntryPointParams_0*)(entryPointParams_0))->ioBuffer_0))[tid_0];
11998

12099
#line 14
121100
*_S8 = o_0;
@@ -137,36 +116,15 @@ gfx_Renderer_0* createRenderer_0(int32_t _0, int32_t _1, gfx_Window_0* _2);
137116
gfx_BufferResource_0* createStructuredBuffer_0(gfx_Renderer_0* _0, FixedArray<float, 4> _1);
138117

139118

140-
#line 33
141-
gfx_ShaderProgram_0* loadShaderProgram_0(gfx_Renderer_0* _0);
119+
#line 4
120+
RWStructuredBuffer<float> convertBuffer_0(gfx_BufferResource_0* _0);
142121

143122

144123
#line 40
145-
gfx_DescriptorSetLayout_0* buildDescriptorSetLayout_0(gfx_Renderer_0* _0);
146-
147-
148-
#line 41
149-
gfx_PipelineLayout_0* buildPipeline_0(gfx_Renderer_0* _0, gfx_DescriptorSetLayout_0* _1);
150-
151-
152-
#line 42
153-
gfx_DescriptorSet_0* buildDescriptorSet_0(gfx_Renderer_0* _0, gfx_DescriptorSetLayout_0* _1, gfx_BufferResource_0* _2);
154-
155-
156-
157-
gfx_PipelineState_0* buildPipelineState_0(gfx_ShaderProgram_0* _0, gfx_Renderer_0* _1, gfx_PipelineLayout_0* _2);
158-
159-
160-
161124
void printInitialValues_0(FixedArray<float, 4> _0, int32_t _1);
162125

163126

164-
#line 51
165-
void dispatchComputation_0(gfx_Renderer_0* _0, gfx_PipelineState_0* _1, gfx_PipelineLayout_0* _2, gfx_DescriptorSet_0* _3);
166-
167-
168-
169-
127+
#line 41
170128
void print_output_0(gfx_Renderer_0* _0, gfx_BufferResource_0* _1, int32_t _2);
171129

172130

@@ -183,21 +141,19 @@ bool executeComputation_0()
183141
gfx_Window_0* _S9 = createWindow_0(int(1024), int(768));
184142
gfx_Renderer_0* _S10 = createRenderer_0(int(1024), int(768), _S9);
185143
gfx_BufferResource_0* _S11 = createStructuredBuffer_0(_S10, initialArray_0);
186-
gfx_ShaderProgram_0* _S12 = loadShaderProgram_0(_S10);
187-
gfx_DescriptorSetLayout_0* _S13 = buildDescriptorSetLayout_0(_S10);
188-
gfx_PipelineLayout_0* _S14 = buildPipeline_0(_S10, _S13);
189-
gfx_DescriptorSet_0* _S15 = buildDescriptorSet_0(_S10, _S13, _S11);
190-
gfx_PipelineState_0* _S16 = buildPipelineState_0(_S12, _S10, _S14);
144+
Vector<uint32_t, 3> _S12 = make_VecU3(uint32_t(int(4)), uint32_t(int(1)), uint32_t(int(1)));
145+
RWStructuredBuffer<float> _S13 = convertBuffer_0(_S11);
146+
147+
#line 57
148+
computeMain_wrapper(_S10, _S12, _S13);
149+
191150
printInitialValues_0(initialArray_0, int(4));
192-
dispatchComputation_0(_S10, _S16, _S14, _S15);
193151
print_output_0(_S10, _S11, int(4));
194152

195153

196154
return true;
197155
}
198156

199-
//} // anonymous
200-
201157
// [numthreads(4, 1, 1)]
202158
SLANG_PRELUDE_EXPORT
203159
void computeMain_Thread(ComputeThreadVaryingInput* varyingInput, void* entryPointParams, void* globalParams)

‎examples/heterogeneous-hello-world/shader.slang

-21
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,7 @@ Ptr<gfx::Renderer> createRenderer(
3737
int gWindowHeight,
3838
Ptr<gfx::Window> gWindow);
3939
Ptr<gfx::BufferResource> createStructuredBuffer(Ptr<gfx::Renderer> gRenderer, float[4] initialArray);
40-
Ptr<gfx::DescriptorSetLayout> buildDescriptorSetLayout(Ptr<gfx::Renderer> gRenderer);
41-
Ptr<gfx::PipelineLayout> buildPipeline(Ptr<gfx::Renderer> gRenderer, Ptr<gfx::DescriptorSetLayout> descriptorSetLayout);
42-
Ptr<gfx::DescriptorSet> buildDescriptorSet(
43-
Ptr<gfx::Renderer> gRenderer,
44-
Ptr<gfx::DescriptorSetLayout> descriptorSetLayout,
45-
Ptr<gfx::BufferResource> gStructuredBuffer);
46-
Ptr<gfx::PipelineState> buildPipelineState(
47-
Ptr<gfx::ShaderProgram> shaderProgram,
48-
Ptr<gfx::Renderer> gRenderer,
49-
Ptr<gfx::PipelineLayout> gPipelineLayout);
5040
void printInitialValues(float[4] initialArray, int length);
51-
void dispatchComputation(
52-
Ptr<gfx::Renderer> gRenderer,
53-
Ptr<gfx::PipelineState> gPipelineState,
54-
Ptr<gfx::PipelineLayout> gPipelineLayout,
55-
Ptr<gfx::DescriptorSet> gDescriptorSet);
5641
void print_output(
5742
Ptr<gfx::Renderer> gRenderer,
5843
Ptr<gfx::BufferResource> gStructuredBuffer,
@@ -71,13 +56,7 @@ public bool executeComputation() {
7156
let structuredBuffer = createStructuredBuffer(renderer, initialArray);
7257
__GPU_FOREACH(renderer, uint3(4, 1, 1), LAMBDA(uint3 dispatchThreadID)
7358
{ computeMain(convertBuffer(structuredBuffer), dispatchThreadID) ; });
74-
let shaderProgram = loadShaderProgram(renderer);
75-
let descriptorSetLayout = buildDescriptorSetLayout(renderer);
76-
let pipelineLayout = buildPipeline(renderer, descriptorSetLayout);
77-
let descriptorSet = buildDescriptorSet(renderer, descriptorSetLayout, structuredBuffer);
78-
let pipelineState = buildPipelineState(shaderProgram, renderer, pipelineLayout);
7959
printInitialValues(initialArray, 4);
80-
dispatchComputation(renderer, pipelineState, pipelineLayout, descriptorSet);
8160
print_output(renderer, structuredBuffer, 4);
8261

8362

‎prelude/slang-cpp-prelude.h

+16
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,20 @@
5050
# define SLANG_UNROLL
5151
#endif
5252

53+
struct gfx_Renderer_0;
54+
struct gfx_BufferResource_0;
55+
struct gfx_ShaderProgram_0;
56+
struct gfx_DescriptorSetLayout_0;
57+
struct gfx_PipelineLayout_0;
58+
struct gfx_DescriptorSet_0;
59+
struct gfx_BufferResource_0;
60+
struct gfx_PipelineState_0;
61+
gfx_ShaderProgram_0* loadShaderProgram_0(gfx_Renderer_0* _0, unsigned char _1[], size_t _2);
62+
gfx_DescriptorSetLayout_0* buildDescriptorSetLayout_0(gfx_Renderer_0* _0);
63+
gfx_PipelineLayout_0* buildPipeline_0(gfx_Renderer_0* _0, gfx_DescriptorSetLayout_0* _1);
64+
gfx_DescriptorSet_0* buildDescriptorSet_0(gfx_Renderer_0* _0, gfx_DescriptorSetLayout_0* _1, gfx_BufferResource_0* _2);
65+
gfx_PipelineState_0* buildPipelineState_0(gfx_ShaderProgram_0* _0, gfx_Renderer_0* _1, gfx_PipelineLayout_0* _2);
66+
void dispatchComputation_0(gfx_Renderer_0* _0, gfx_PipelineState_0* _1, gfx_PipelineLayout_0* _2, gfx_DescriptorSet_0* _3, uint32_t _4, uint32_t _5, uint32_t _6);
67+
gfx_BufferResource_0* unconvertBuffer_0(RWStructuredBuffer<float> _0);
68+
5369
#endif

‎source/slang/slang-emit-c-like.cpp

+25
Original file line numberDiff line numberDiff line change
@@ -2425,6 +2425,31 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
24252425
m_writer->emit(")");
24262426
break;
24272427
}
2428+
case kIROp_GpuForeach:
2429+
{
2430+
auto operand = inst->getOperand(2);
2431+
if (as<IRFunc>(operand))
2432+
{
2433+
//emitOperand(operand->findDecoration<IREntryPointDecoration>(), getInfo(EmitOp::General));
2434+
emitOperand(operand, getInfo(EmitOp::General));
2435+
}
2436+
else
2437+
{
2438+
SLANG_UNEXPECTED("Expected 3rd operand to be a function");
2439+
}
2440+
m_writer->emit("_wrapper(");
2441+
emitOperand(inst->getOperand(0), getInfo(EmitOp::General));
2442+
m_writer->emit(", ");
2443+
emitOperand(inst->getOperand(1), getInfo(EmitOp::General));
2444+
UInt argCount = inst->getOperandCount();
2445+
for (UInt aa = 3; aa < argCount; ++aa)
2446+
{
2447+
m_writer->emit(", ");
2448+
emitOperand(inst->getOperand(aa), getInfo(EmitOp::General));
2449+
}
2450+
m_writer->emit(")");
2451+
break;
2452+
}
24282453
default:
24292454
diagnoseUnhandledInst(inst);
24302455
break;

0 commit comments

Comments
 (0)