From f65d756bff8d4c5cbc15bd0322a2ae8e6b896a21 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 29 Oct 2024 14:49:26 +0800 Subject: format * format * Minor test fixes * enable checking cpp format in ci --- tools/gfx-unit-test/precompiled-module-2.cpp | 361 ++++++++++++++------------- 1 file changed, 183 insertions(+), 178 deletions(-) (limited to 'tools/gfx-unit-test/precompiled-module-2.cpp') diff --git a/tools/gfx-unit-test/precompiled-module-2.cpp b/tools/gfx-unit-test/precompiled-module-2.cpp index f997b2a7b..0a5ea3ac0 100644 --- a/tools/gfx-unit-test/precompiled-module-2.cpp +++ b/tools/gfx-unit-test/precompiled-module-2.cpp @@ -1,121 +1,125 @@ -#include "tools/unit-test/slang-unit-test.h" - -#include "slang-gfx.h" #include "gfx-test-util.h" -#include "tools/gfx-util/shader-cursor.h" +#include "slang-gfx.h" #include "source/core/slang-basic.h" #include "source/core/slang-blob.h" -#include "source/core/slang-memory-file-system.h" #include "source/core/slang-io.h" +#include "source/core/slang-memory-file-system.h" +#include "tools/gfx-util/shader-cursor.h" +#include "tools/unit-test/slang-unit-test.h" using namespace gfx; namespace gfx_test { - // Test that mixing precompiled and non-precompiled modules is working. +// Test that mixing precompiled and non-precompiled modules is working. - static Slang::Result precompileProgram( - gfx::IDevice* device, - ISlangMutableFileSystem* fileSys, - const char* shaderModuleName, - bool precompileToTarget) +static Slang::Result precompileProgram( + gfx::IDevice* device, + ISlangMutableFileSystem* fileSys, + const char* shaderModuleName, + bool precompileToTarget) +{ + Slang::ComPtr slangSession; + SLANG_RETURN_ON_FAIL(device->getSlangSession(slangSession.writeRef())); + slang::SessionDesc sessionDesc = {}; + auto searchPaths = getSlangSearchPaths(); + sessionDesc.searchPathCount = searchPaths.getCount(); + sessionDesc.searchPaths = searchPaths.getBuffer(); + auto globalSession = slangSession->getGlobalSession(); + globalSession->createSession(sessionDesc, slangSession.writeRef()); + + slang::IModule* module; { - Slang::ComPtr slangSession; - SLANG_RETURN_ON_FAIL(device->getSlangSession(slangSession.writeRef())); - slang::SessionDesc sessionDesc = {}; - auto searchPaths = getSlangSearchPaths(); - sessionDesc.searchPathCount = searchPaths.getCount(); - sessionDesc.searchPaths = searchPaths.getBuffer(); - auto globalSession = slangSession->getGlobalSession(); - globalSession->createSession(sessionDesc, slangSession.writeRef()); - - slang::IModule* module; - { - Slang::ComPtr diagnosticsBlob; - module = slangSession->loadModule(shaderModuleName, diagnosticsBlob.writeRef()); - diagnoseIfNeeded(diagnosticsBlob); - } - if (!module) - return SLANG_FAIL; + Slang::ComPtr diagnosticsBlob; + module = slangSession->loadModule(shaderModuleName, diagnosticsBlob.writeRef()); + diagnoseIfNeeded(diagnosticsBlob); + } + if (!module) + return SLANG_FAIL; - if (precompileToTarget) + if (precompileToTarget) + { + SlangCompileTarget target; + switch (device->getDeviceInfo().deviceType) { - SlangCompileTarget target; - switch (device->getDeviceInfo().deviceType) - { - case gfx::DeviceType::DirectX12: - target = SLANG_DXIL; - break; - case gfx::DeviceType::Vulkan: - target = SLANG_SPIRV; - break; - default: - return SLANG_FAIL; - } - - ComPtr precompileService; - if (module->queryInterface(slang::SLANG_UUID_IModulePrecompileService_Experimental, (void**)precompileService.writeRef()) == SLANG_OK) - { - Slang::ComPtr diagnosticsBlob; - precompileService->precompileForTarget(target, diagnosticsBlob.writeRef()); - diagnoseIfNeeded(diagnosticsBlob); - } + case gfx::DeviceType::DirectX12: target = SLANG_DXIL; break; + case gfx::DeviceType::Vulkan: target = SLANG_SPIRV; break; + default: return SLANG_FAIL; } - // Write loaded modules to memory file system. - for (SlangInt i = 0; i < slangSession->getLoadedModuleCount(); i++) + ComPtr precompileService; + if (module->queryInterface( + slang::SLANG_UUID_IModulePrecompileService_Experimental, + (void**)precompileService.writeRef()) == SLANG_OK) { - auto module = slangSession->getLoadedModule(i); - auto path = module->getFilePath(); - if (path) - { - auto name = module->getName(); - ComPtr outBlob; - module->serialize(outBlob.writeRef()); - fileSys->saveFileBlob((Slang::String(name) + ".slang-module").getBuffer(), outBlob); - } + Slang::ComPtr diagnosticsBlob; + precompileService->precompileForTarget(target, diagnosticsBlob.writeRef()); + diagnoseIfNeeded(diagnosticsBlob); } - return SLANG_OK; } - void precompiledModule2TestImplCommon(IDevice* device, UnitTestContext* context, bool precompileToTarget) + // Write loaded modules to memory file system. + for (SlangInt i = 0; i < slangSession->getLoadedModuleCount(); i++) { - Slang::ComPtr transientHeap; - ITransientResourceHeap::Desc transientHeapDesc = {}; - transientHeapDesc.constantBufferSize = 4096; - GFX_CHECK_CALL_ABORT( - device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef())); - - // First, load and compile the slang source. - ComPtr memoryFileSystem = ComPtr(new Slang::MemoryFileSystem()); - - ComPtr shaderProgram; - slang::ProgramLayout* slangReflection; - GFX_CHECK_CALL_ABORT(precompileProgram(device, memoryFileSystem.get(), "precompiled-module-imported", precompileToTarget)); - - // Next, load the precompiled slang program. - Slang::ComPtr slangSession; - device->getSlangSession(slangSession.writeRef()); - slang::SessionDesc sessionDesc = {}; - sessionDesc.targetCount = 1; - slang::TargetDesc targetDesc = {}; - switch (device->getDeviceInfo().deviceType) + auto module = slangSession->getLoadedModule(i); + auto path = module->getFilePath(); + if (path) { - case gfx::DeviceType::DirectX12: - targetDesc.format = SLANG_DXIL; - targetDesc.profile = device->getSlangSession()->getGlobalSession()->findProfile("sm_6_1"); - break; - case gfx::DeviceType::Vulkan: - targetDesc.format = SLANG_SPIRV; - targetDesc.profile = device->getSlangSession()->getGlobalSession()->findProfile("GLSL_460"); - break; + auto name = module->getName(); + ComPtr outBlob; + module->serialize(outBlob.writeRef()); + fileSys->saveFileBlob((Slang::String(name) + ".slang-module").getBuffer(), outBlob); } - sessionDesc.targets = &targetDesc; - sessionDesc.fileSystem = memoryFileSystem.get(); - auto globalSession = slangSession->getGlobalSession(); - globalSession->createSession(sessionDesc, slangSession.writeRef()); + } + return SLANG_OK; +} + +void precompiledModule2TestImplCommon( + IDevice* device, + UnitTestContext* context, + bool precompileToTarget) +{ + Slang::ComPtr transientHeap; + ITransientResourceHeap::Desc transientHeapDesc = {}; + transientHeapDesc.constantBufferSize = 4096; + GFX_CHECK_CALL_ABORT( + device->createTransientResourceHeap(transientHeapDesc, transientHeap.writeRef())); + + // First, load and compile the slang source. + ComPtr memoryFileSystem = + ComPtr(new Slang::MemoryFileSystem()); + + ComPtr shaderProgram; + slang::ProgramLayout* slangReflection; + GFX_CHECK_CALL_ABORT(precompileProgram( + device, + memoryFileSystem.get(), + "precompiled-module-imported", + precompileToTarget)); + + // Next, load the precompiled slang program. + Slang::ComPtr slangSession; + device->getSlangSession(slangSession.writeRef()); + slang::SessionDesc sessionDesc = {}; + sessionDesc.targetCount = 1; + slang::TargetDesc targetDesc = {}; + switch (device->getDeviceInfo().deviceType) + { + case gfx::DeviceType::DirectX12: + targetDesc.format = SLANG_DXIL; + targetDesc.profile = device->getSlangSession()->getGlobalSession()->findProfile("sm_6_1"); + break; + case gfx::DeviceType::Vulkan: + targetDesc.format = SLANG_SPIRV; + targetDesc.profile = device->getSlangSession()->getGlobalSession()->findProfile("GLSL_460"); + break; + } + sessionDesc.targets = &targetDesc; + sessionDesc.fileSystem = memoryFileSystem.get(); + auto globalSession = slangSession->getGlobalSession(); + globalSession->createSession(sessionDesc, slangSession.writeRef()); - const char* moduleSrc = R"( + const char* moduleSrc = R"( import "precompiled-module-imported"; // Main entry-point. @@ -131,99 +135,100 @@ namespace gfx_test buffer[sv_dispatchThreadID.x] = helperFunc() + helperFunc1(); } )"; - memoryFileSystem->saveFile("precompiled-module.slang", moduleSrc, strlen(moduleSrc)); - GFX_CHECK_CALL_ABORT(loadComputeProgram(device, slangSession, shaderProgram, "precompiled-module", "computeMain", slangReflection)); - - ComputePipelineStateDesc pipelineDesc = {}; - pipelineDesc.program = shaderProgram.get(); - ComPtr pipelineState; - GFX_CHECK_CALL_ABORT( - device->createComputePipelineState(pipelineDesc, pipelineState.writeRef())); - - const int numberCount = 4; - float initialData[] = { 0.0f, 0.0f, 0.0f, 0.0f }; - IBufferResource::Desc bufferDesc = {}; - bufferDesc.sizeInBytes = numberCount * sizeof(float); - bufferDesc.format = gfx::Format::Unknown; - bufferDesc.elementSize = sizeof(float); - bufferDesc.allowedStates = ResourceStateSet( - ResourceState::ShaderResource, - ResourceState::UnorderedAccess, - ResourceState::CopyDestination, - ResourceState::CopySource); - bufferDesc.defaultState = ResourceState::UnorderedAccess; - bufferDesc.memoryType = MemoryType::DeviceLocal; - - ComPtr numbersBuffer; - GFX_CHECK_CALL_ABORT(device->createBufferResource( - bufferDesc, - (void*)initialData, - numbersBuffer.writeRef())); - - ComPtr bufferView; - IResourceView::Desc viewDesc = {}; - viewDesc.type = IResourceView::Type::UnorderedAccess; - viewDesc.format = Format::Unknown; - GFX_CHECK_CALL_ABORT( - device->createBufferView(numbersBuffer, nullptr, viewDesc, bufferView.writeRef())); - - // We have done all the set up work, now it is time to start recording a command buffer for - // GPU execution. - { - ICommandQueue::Desc queueDesc = { ICommandQueue::QueueType::Graphics }; - auto queue = device->createCommandQueue(queueDesc); - - auto commandBuffer = transientHeap->createCommandBuffer(); - auto encoder = commandBuffer->encodeComputeCommands(); + memoryFileSystem->saveFile("precompiled-module.slang", moduleSrc, strlen(moduleSrc)); + GFX_CHECK_CALL_ABORT(loadComputeProgram( + device, + slangSession, + shaderProgram, + "precompiled-module", + "computeMain", + slangReflection)); + + ComputePipelineStateDesc pipelineDesc = {}; + pipelineDesc.program = shaderProgram.get(); + ComPtr pipelineState; + GFX_CHECK_CALL_ABORT( + device->createComputePipelineState(pipelineDesc, pipelineState.writeRef())); + + const int numberCount = 4; + float initialData[] = {0.0f, 0.0f, 0.0f, 0.0f}; + IBufferResource::Desc bufferDesc = {}; + bufferDesc.sizeInBytes = numberCount * sizeof(float); + bufferDesc.format = gfx::Format::Unknown; + bufferDesc.elementSize = sizeof(float); + bufferDesc.allowedStates = ResourceStateSet( + ResourceState::ShaderResource, + ResourceState::UnorderedAccess, + ResourceState::CopyDestination, + ResourceState::CopySource); + bufferDesc.defaultState = ResourceState::UnorderedAccess; + bufferDesc.memoryType = MemoryType::DeviceLocal; + + ComPtr numbersBuffer; + GFX_CHECK_CALL_ABORT( + device->createBufferResource(bufferDesc, (void*)initialData, numbersBuffer.writeRef())); + + ComPtr bufferView; + IResourceView::Desc viewDesc = {}; + viewDesc.type = IResourceView::Type::UnorderedAccess; + viewDesc.format = Format::Unknown; + GFX_CHECK_CALL_ABORT( + device->createBufferView(numbersBuffer, nullptr, viewDesc, bufferView.writeRef())); + + // We have done all the set up work, now it is time to start recording a command buffer for + // GPU execution. + { + ICommandQueue::Desc queueDesc = {ICommandQueue::QueueType::Graphics}; + auto queue = device->createCommandQueue(queueDesc); - auto rootObject = encoder->bindPipeline(pipelineState); + auto commandBuffer = transientHeap->createCommandBuffer(); + auto encoder = commandBuffer->encodeComputeCommands(); - ShaderCursor entryPointCursor( - rootObject->getEntryPoint(0)); // get a cursor the the first entry-point. - // Bind buffer view to the entry point. - entryPointCursor.getPath("buffer").setResource(bufferView); + auto rootObject = encoder->bindPipeline(pipelineState); - encoder->dispatchCompute(1, 1, 1); - encoder->endEncoding(); - commandBuffer->close(); - queue->executeCommandBuffer(commandBuffer); - queue->waitOnHost(); - } + ShaderCursor entryPointCursor( + rootObject->getEntryPoint(0)); // get a cursor the the first entry-point. + // Bind buffer view to the entry point. + entryPointCursor.getPath("buffer").setResource(bufferView); - compareComputeResult( - device, - numbersBuffer, - Slang::makeArray(3.0f, 3.0f, 3.0f, 3.0f)); + encoder->dispatchCompute(1, 1, 1); + encoder->endEncoding(); + commandBuffer->close(); + queue->executeCommandBuffer(commandBuffer); + queue->waitOnHost(); } - void precompiledModule2TestImpl(IDevice* device, UnitTestContext* context) - { - precompiledModule2TestImplCommon(device, context, false); - } + compareComputeResult(device, numbersBuffer, Slang::makeArray(3.0f, 3.0f, 3.0f, 3.0f)); +} - void precompiledTargetModule2TestImpl(IDevice* device, UnitTestContext* context) - { - precompiledModule2TestImplCommon(device, context, true); - } +void precompiledModule2TestImpl(IDevice* device, UnitTestContext* context) +{ + precompiledModule2TestImplCommon(device, context, false); +} - SLANG_UNIT_TEST(precompiledModule2D3D12) - { - runTestImpl(precompiledModule2TestImpl, unitTestContext, Slang::RenderApiFlag::D3D12); - } +void precompiledTargetModule2TestImpl(IDevice* device, UnitTestContext* context) +{ + precompiledModule2TestImplCommon(device, context, true); +} - SLANG_UNIT_TEST(precompiledTargetModule2D3D12) - { - runTestImpl(precompiledTargetModule2TestImpl, unitTestContext, Slang::RenderApiFlag::D3D12); - } +SLANG_UNIT_TEST(precompiledModule2D3D12) +{ + runTestImpl(precompiledModule2TestImpl, unitTestContext, Slang::RenderApiFlag::D3D12); +} - SLANG_UNIT_TEST(precompiledModule2Vulkan) - { - runTestImpl(precompiledModule2TestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan); - } +SLANG_UNIT_TEST(precompiledTargetModule2D3D12) +{ + runTestImpl(precompiledTargetModule2TestImpl, unitTestContext, Slang::RenderApiFlag::D3D12); +} - SLANG_UNIT_TEST(precompiledTargetModule2Vulkan) - { - runTestImpl(precompiledTargetModule2TestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan); - } +SLANG_UNIT_TEST(precompiledModule2Vulkan) +{ + runTestImpl(precompiledModule2TestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan); +} +SLANG_UNIT_TEST(precompiledTargetModule2Vulkan) +{ + runTestImpl(precompiledTargetModule2TestImpl, unitTestContext, Slang::RenderApiFlag::Vulkan); } + +} // namespace gfx_test -- cgit v1.2.3