Updated glslang as core dependency
This commit is contained in:
Alejandro Saucedo
parent
1357549900
commit
598c843545
8 changed files with 23 additions and 362 deletions
|
|
@ -32,7 +32,7 @@ if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
|
|||
target_link_libraries(test_kompute
|
||||
gtest_main)
|
||||
else()
|
||||
target_link_libraries(test_kompute PRIVATE
|
||||
target_link_libraries(test_kompute
|
||||
GTest::gtest)
|
||||
endif()
|
||||
|
||||
|
|
@ -40,39 +40,6 @@ target_link_libraries(test_kompute kompute)
|
|||
|
||||
add_test(NAME test_kompute COMMAND test_kompute)
|
||||
|
||||
#####################################################
|
||||
#################### GLSLANG #######################
|
||||
#####################################################
|
||||
|
||||
if(KOMPUTE_OPT_REPO_SUBMODULE_BUILD)
|
||||
add_subdirectory(${PROJECT_SOURCE_DIR}/external/glslang
|
||||
${CMAKE_CURRENT_BINARY_DIR}/kompute_glslang)
|
||||
|
||||
target_include_directories(
|
||||
test_kompute PRIVATE
|
||||
${PROJECT_SOURCE_DIR}/external/glslang)
|
||||
|
||||
target_link_libraries(test_kompute
|
||||
# Not including hlsl support
|
||||
# HLSL
|
||||
# glslang includes OGLCompiler, OSDependent, MachineIndependent
|
||||
glslang
|
||||
SPIRV)
|
||||
else()
|
||||
find_package(glslang CONFIG REQUIRED)
|
||||
|
||||
target_include_directories(
|
||||
test_kompute PRIVATE
|
||||
${GLSLANG_GENERATED_INCLUDEDIR})
|
||||
|
||||
target_link_libraries(test_kompute
|
||||
# Not including hlsl support
|
||||
# glslang::HLSL
|
||||
# Adding explicit dependencies to match above
|
||||
glslang::glslang
|
||||
glslang::SPIRV)
|
||||
endif()
|
||||
|
||||
|
||||
#####################################################
|
||||
#################### CODECOV #######################
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
#include "gtest/gtest.h"
|
||||
|
||||
#include "kompute/Kompute.hpp"
|
||||
|
||||
#include "kompute_test/Shader.hpp"
|
||||
|
||||
static const std::string shaderString = (R"(
|
||||
#version 450
|
||||
|
||||
layout (local_size_x = 1) in;
|
||||
|
||||
// The input tensors bind index is relative to index in parameter passed
|
||||
layout(set = 0, binding = 0) buffer bina { float tina[]; };
|
||||
layout(set = 0, binding = 1) buffer binb { float tinb[]; };
|
||||
layout(set = 0, binding = 2) buffer bout { float tout[]; };
|
||||
|
||||
void main() {
|
||||
uint index = gl_GlobalInvocationID.x;
|
||||
|
||||
int i = 1;
|
||||
|
||||
while(i < 200) {
|
||||
tout[index] += tina[index] * tinb[index];
|
||||
i++;
|
||||
}
|
||||
}
|
||||
)");
|
||||
|
||||
void
|
||||
compileShaderWithGivenResources(const std::string shaderString,
|
||||
const TBuiltInResource resources)
|
||||
{
|
||||
kp_test_utils::Shader::compileSource(
|
||||
shaderString,
|
||||
std::string("main"),
|
||||
std::vector<std::pair<std::string, std::string>>({}),
|
||||
resources);
|
||||
}
|
||||
|
||||
TEST(TestShaderResources, TestNoMaxLight)
|
||||
{
|
||||
TBuiltInResource noMaxLightResources = kp_test_utils::Shader::defaultResource;
|
||||
noMaxLightResources.maxLights = 0;
|
||||
|
||||
EXPECT_NO_THROW(
|
||||
compileShaderWithGivenResources(shaderString, noMaxLightResources));
|
||||
}
|
||||
|
||||
TEST(TestShaderResources, TestSmallComputeWorkGroupSizeX)
|
||||
{
|
||||
TBuiltInResource smallComputeWorkGroupSizeXResources =
|
||||
kp_test_utils::Shader::defaultResource;
|
||||
smallComputeWorkGroupSizeXResources.maxComputeWorkGroupSizeX = 0;
|
||||
|
||||
ASSERT_THROW(compileShaderWithGivenResources(
|
||||
shaderString, smallComputeWorkGroupSizeXResources),
|
||||
std::runtime_error);
|
||||
}
|
||||
|
||||
TEST(TestShaderResources, TestNoWhileLoopLimit)
|
||||
{
|
||||
TBuiltInResource noWhileLoopLimitResources = kp_test_utils::Shader::defaultResource;
|
||||
noWhileLoopLimitResources.limits.whileLoops = 0;
|
||||
|
||||
ASSERT_THROW(
|
||||
compileShaderWithGivenResources(shaderString, noWhileLoopLimitResources),
|
||||
std::runtime_error);
|
||||
}
|
||||
|
|
@ -5,214 +5,23 @@
|
|||
|
||||
namespace kp_test_utils {
|
||||
|
||||
std::vector<uint32_t>
|
||||
Shader::compileSources(
|
||||
const std::vector<std::string>& sources,
|
||||
const std::vector<std::string>& files,
|
||||
const std::string& entryPoint,
|
||||
std::vector<std::pair<std::string, std::string>> definitions,
|
||||
const TBuiltInResource& resources)
|
||||
{
|
||||
|
||||
// Initialize glslang library.
|
||||
glslang::InitializeProcess();
|
||||
|
||||
// Currently we don't support other shader types nor plan to
|
||||
const EShLanguage language = EShLangCompute;
|
||||
glslang::TShader shader(language);
|
||||
|
||||
std::vector<const char*> filesCStr(files.size()),
|
||||
sourcesCStr(sources.size());
|
||||
for (size_t i = 0; i < sources.size(); i++)
|
||||
sourcesCStr[i] = sources[i].c_str();
|
||||
|
||||
if (files.size() > 1) {
|
||||
assert(files.size() == sources.size());
|
||||
for (size_t i = 0; i < files.size(); i++)
|
||||
filesCStr[i] = files[i].c_str();
|
||||
shader.setStringsWithLengthsAndNames(
|
||||
sourcesCStr.data(), nullptr, filesCStr.data(), filesCStr.size());
|
||||
} else {
|
||||
filesCStr = { "" };
|
||||
shader.setStringsWithLengthsAndNames(
|
||||
sourcesCStr.data(), nullptr, filesCStr.data(), sourcesCStr.size());
|
||||
}
|
||||
|
||||
shader.setEntryPoint(entryPoint.c_str());
|
||||
shader.setSourceEntryPoint(entryPoint.c_str());
|
||||
|
||||
std::string info_log = "";
|
||||
const EShMessages messages = static_cast<EShMessages>(
|
||||
EShMsgDefault | EShMsgVulkanRules | EShMsgSpvRules);
|
||||
if (!shader.parse(&resources, 100, false, messages)) {
|
||||
info_log = std::string(shader.getInfoLog()) + "\n" +
|
||||
std::string(shader.getInfoDebugLog());
|
||||
KP_LOG_ERROR("Kompute Shader Error: {}", info_log);
|
||||
throw std::runtime_error(info_log);
|
||||
}
|
||||
|
||||
// Add shader to new program object.
|
||||
glslang::TProgram program;
|
||||
program.addShader(&shader);
|
||||
// Link program.
|
||||
if (!program.link(messages)) {
|
||||
info_log = std::string(program.getInfoLog()) + "\n" +
|
||||
std::string(program.getInfoDebugLog());
|
||||
KP_LOG_ERROR("Kompute Shader Error: {}", info_log);
|
||||
throw std::runtime_error(info_log);
|
||||
}
|
||||
|
||||
// Save any info log that was generated.
|
||||
if (shader.getInfoLog()) {
|
||||
info_log += std::string(shader.getInfoLog()) + "\n" +
|
||||
std::string(shader.getInfoDebugLog()) + "\n";
|
||||
KP_LOG_INFO("Kompute Shader Information: {}", info_log);
|
||||
}
|
||||
|
||||
glslang::TIntermediate* intermediate = program.getIntermediate(language);
|
||||
// Translate to SPIRV.
|
||||
if (!intermediate) {
|
||||
info_log += "Failed to get shared intermediate code.\n";
|
||||
KP_LOG_ERROR("Kompute Shader Error: {}", info_log);
|
||||
throw std::runtime_error(info_log);
|
||||
}
|
||||
|
||||
spv::SpvBuildLogger logger;
|
||||
std::vector<std::uint32_t> spirv;
|
||||
glslang::GlslangToSpv(*intermediate, spirv, &logger);
|
||||
|
||||
if (shader.getInfoLog()) {
|
||||
info_log += logger.getAllMessages() + "\n";
|
||||
KP_LOG_DEBUG("Kompute Shader all result messages: {}", info_log);
|
||||
}
|
||||
|
||||
// Shutdown glslang library.
|
||||
glslang::FinalizeProcess();
|
||||
|
||||
return spirv;
|
||||
}
|
||||
|
||||
std::vector<uint32_t>
|
||||
Shader::compileSource(
|
||||
const std::string& source,
|
||||
const std::string& entryPoint,
|
||||
std::vector<std::pair<std::string, std::string>> definitions,
|
||||
const TBuiltInResource& resource)
|
||||
const std::string& source)
|
||||
{
|
||||
return compileSources({ source },
|
||||
std::vector<std::string>({}),
|
||||
entryPoint,
|
||||
definitions,
|
||||
resource);
|
||||
std::string cmd = "glslc -fshader-stage=compute -o tmp_kp_shader.comp.spv - << END\n" + source + "\nEND";
|
||||
system(cmd.c_str());
|
||||
|
||||
std::ifstream fileStream("tmp_kp_shader.comp.spv",
|
||||
std::ios::binary | std::ios::in | std::ios::ate);
|
||||
|
||||
size_t shaderFileSize = fileStream.tellg();
|
||||
fileStream.seekg(0, std::ios::beg);
|
||||
char* shaderDataRaw = new char[shaderFileSize];
|
||||
fileStream.read(shaderDataRaw, shaderFileSize);
|
||||
fileStream.close();
|
||||
std::vector<uint32_t> tmpResult = {(uint32_t*)shaderDataRaw, (uint32_t*)(shaderDataRaw + shaderFileSize)};
|
||||
return tmpResult;
|
||||
}
|
||||
|
||||
const TBuiltInResource Shader::defaultResource = {
|
||||
/* .MaxLights = */ 0,
|
||||
/* .MaxClipPlanes = */ 0,
|
||||
/* .MaxTextureUnits = */ 0,
|
||||
/* .MaxTextureCoords = */ 0,
|
||||
/* .MaxVertexAttribs = */ 64,
|
||||
/* .MaxVertexUniformComponents = */ 4096,
|
||||
/* .MaxVaryingFloats = */ 64,
|
||||
/* .MaxVertexTextureImageUnits = */ 0,
|
||||
/* .MaxCombinedTextureImageUnits = */ 0,
|
||||
/* .MaxTextureImageUnits = */ 0,
|
||||
/* .MaxFragmentUniformComponents = */ 0,
|
||||
/* .MaxDrawBuffers = */ 0,
|
||||
/* .MaxVertexUniformVectors = */ 128,
|
||||
/* .MaxVaryingVectors = */ 8,
|
||||
/* .MaxFragmentUniformVectors = */ 0,
|
||||
/* .MaxVertexOutputVectors = */ 16,
|
||||
/* .MaxFragmentInputVectors = */ 0,
|
||||
/* .MinProgramTexelOffset = */ -8,
|
||||
/* .MaxProgramTexelOffset = */ 7,
|
||||
/* .MaxClipDistances = */ 8,
|
||||
/* .MaxComputeWorkGroupCountX = */ 65535,
|
||||
/* .MaxComputeWorkGroupCountY = */ 65535,
|
||||
/* .MaxComputeWorkGroupCountZ = */ 65535,
|
||||
/* .MaxComputeWorkGroupSizeX = */ 1024,
|
||||
/* .MaxComputeWorkGroupSizeY = */ 1024,
|
||||
/* .MaxComputeWorkGroupSizeZ = */ 64,
|
||||
/* .MaxComputeUniformComponents = */ 1024,
|
||||
/* .MaxComputeTextureImageUnits = */ 16,
|
||||
/* .MaxComputeImageUniforms = */ 8,
|
||||
/* .MaxComputeAtomicCounters = */ 8,
|
||||
/* .MaxComputeAtomicCounterBuffers = */ 1,
|
||||
/* .MaxVaryingComponents = */ 60,
|
||||
/* .MaxVertexOutputComponents = */ 64,
|
||||
/* .MaxGeometryInputComponents = */ 64,
|
||||
/* .MaxGeometryOutputComponents = */ 128,
|
||||
/* .MaxFragmentInputComponents = */ 0,
|
||||
/* .MaxImageUnits = */ 0,
|
||||
/* .MaxCombinedImageUnitsAndFragmentOutputs = */ 0,
|
||||
/* .MaxCombinedShaderOutputResources = */ 8,
|
||||
/* .MaxImageSamples = */ 0,
|
||||
/* .MaxVertexImageUniforms = */ 0,
|
||||
/* .MaxTessControlImageUniforms = */ 0,
|
||||
/* .MaxTessEvaluationImageUniforms = */ 0,
|
||||
/* .MaxGeometryImageUniforms = */ 0,
|
||||
/* .MaxFragmentImageUniforms = */ 0,
|
||||
/* .MaxCombinedImageUniforms = */ 0,
|
||||
/* .MaxGeometryTextureImageUnits = */ 0,
|
||||
/* .MaxGeometryOutputVertices = */ 256,
|
||||
/* .MaxGeometryTotalOutputComponents = */ 1024,
|
||||
/* .MaxGeometryUniformComponents = */ 1024,
|
||||
/* .MaxGeometryVaryingComponents = */ 64,
|
||||
/* .MaxTessControlInputComponents = */ 128,
|
||||
/* .MaxTessControlOutputComponents = */ 128,
|
||||
/* .MaxTessControlTextureImageUnits = */ 0,
|
||||
/* .MaxTessControlUniformComponents = */ 1024,
|
||||
/* .MaxTessControlTotalOutputComponents = */ 4096,
|
||||
/* .MaxTessEvaluationInputComponents = */ 128,
|
||||
/* .MaxTessEvaluationOutputComponents = */ 128,
|
||||
/* .MaxTessEvaluationTextureImageUnits = */ 16,
|
||||
/* .MaxTessEvaluationUniformComponents = */ 1024,
|
||||
/* .MaxTessPatchComponents = */ 120,
|
||||
/* .MaxPatchVertices = */ 32,
|
||||
/* .MaxTessGenLevel = */ 64,
|
||||
/* .MaxViewports = */ 16,
|
||||
/* .MaxVertexAtomicCounters = */ 0,
|
||||
/* .MaxTessControlAtomicCounters = */ 0,
|
||||
/* .MaxTessEvaluationAtomicCounters = */ 0,
|
||||
/* .MaxGeometryAtomicCounters = */ 0,
|
||||
/* .MaxFragmentAtomicCounters = */ 0,
|
||||
/* .MaxCombinedAtomicCounters = */ 8,
|
||||
/* .MaxAtomicCounterBindings = */ 1,
|
||||
/* .MaxVertexAtomicCounterBuffers = */ 0,
|
||||
/* .MaxTessControlAtomicCounterBuffers = */ 0,
|
||||
/* .MaxTessEvaluationAtomicCounterBuffers = */ 0,
|
||||
/* .MaxGeometryAtomicCounterBuffers = */ 0,
|
||||
/* .MaxFragmentAtomicCounterBuffers = */ 0,
|
||||
/* .MaxCombinedAtomicCounterBuffers = */ 1,
|
||||
/* .MaxAtomicCounterBufferSize = */ 16384,
|
||||
/* .MaxTransformFeedbackBuffers = */ 4,
|
||||
/* .MaxTransformFeedbackInterleavedComponents = */ 64,
|
||||
/* .MaxCullDistances = */ 8,
|
||||
/* .MaxCombinedClipAndCullDistances = */ 8,
|
||||
/* .MaxSamples = */ 4,
|
||||
/* .maxMeshOutputVerticesNV = */ 256,
|
||||
/* .maxMeshOutputPrimitivesNV = */ 512,
|
||||
/* .maxMeshWorkGroupSizeX_NV = */ 32,
|
||||
/* .maxMeshWorkGroupSizeY_NV = */ 1,
|
||||
/* .maxMeshWorkGroupSizeZ_NV = */ 1,
|
||||
/* .maxTaskWorkGroupSizeX_NV = */ 32,
|
||||
/* .maxTaskWorkGroupSizeY_NV = */ 1,
|
||||
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
|
||||
/* .maxMeshViewCountNV = */ 4,
|
||||
/* .maxDualSourceDrawBuffersEXT = */ 1,
|
||||
|
||||
/* .limits = */
|
||||
{
|
||||
/* .nonInductiveForLoops = */ 1,
|
||||
/* .whileLoops = */ 1,
|
||||
/* .doWhileLoops = */ 1,
|
||||
/* .generalUniformIndexing = */ 1,
|
||||
/* .generalAttributeMatrixVectorIndexing = */ 1,
|
||||
/* .generalVaryingIndexing = */ 1,
|
||||
/* .generalSamplerIndexing = */ 1,
|
||||
/* .generalVariableIndexing = */ 1,
|
||||
/* .generalConstantMatrixVectorIndexing = */ 1,
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
#ifdef USE_EXTERNAL_GLSLANG
|
||||
#include <SPIRV/GlslangToSpv.h>
|
||||
#else
|
||||
#include <glslang/SPIRV/GlslangToSpv.h>
|
||||
#endif
|
||||
|
||||
#include <glslang/Include/ResourceLimits.h>
|
||||
#include <glslang/Public/ShaderLang.h>
|
||||
|
||||
namespace kp_test_utils {
|
||||
|
||||
/**
|
||||
|
|
@ -20,52 +11,17 @@ namespace kp_test_utils {
|
|||
class Shader
|
||||
{
|
||||
public:
|
||||
// The default resource limit for the GLSL compiler, can be overwritten
|
||||
// Has been adopted by:
|
||||
// https://github.com/KhronosGroup/glslang/blob/master/StandAlone/ResourceLimits.cpp
|
||||
const static TBuiltInResource defaultResource;
|
||||
|
||||
/**
|
||||
* Compile multiple sources with optional filenames. Currently this function
|
||||
* uses the glslang C++ interface which is not thread safe so this funciton
|
||||
* should not be called from multiple threads concurrently. If you have a
|
||||
* online shader processing multithreading use-case that can't use offline
|
||||
* compilation please open an issue.
|
||||
*
|
||||
* @param sources A list of raw glsl shaders in string format
|
||||
* @param files A list of file names respective to each of the sources
|
||||
* @param entryPoint The function name to use as entry point
|
||||
* @param definitions List of pairs containing key value definitions
|
||||
* @param resourcesLimit A list that contains the resource limits for the
|
||||
* GLSL compiler
|
||||
* @return The compiled SPIR-V binary in unsigned int32 format
|
||||
*/
|
||||
static std::vector<uint32_t> compileSources(
|
||||
const std::vector<std::string>& sources,
|
||||
const std::vector<std::string>& files = {},
|
||||
const std::string& entryPoint = "main",
|
||||
std::vector<std::pair<std::string, std::string>> definitions = {},
|
||||
const TBuiltInResource& resources = Shader::defaultResource);
|
||||
|
||||
/**
|
||||
* Compile a single glslang source from string value. Currently this
|
||||
* function uses the glslang C++ interface which is not thread safe so this
|
||||
* funciton should not be called from multiple threads concurrently. If you
|
||||
* have a online shader processing multithreading use-case that can't use
|
||||
* offline compilation please open an issue.
|
||||
* Compile a single glslang source from string value. This is only meant
|
||||
* to be used for testing as it's non threadsafe, and it had to be removed
|
||||
* from the glslang dependency and now can only run the CLI directly due to
|
||||
* license issues: see https://github.com/EthicalML/vulkan-kompute/pull/235
|
||||
*
|
||||
* @param source An individual raw glsl shader in string format
|
||||
* @param entryPoint The function name to use as entry point
|
||||
* @param definitions List of pairs containing key value definitions
|
||||
* @param resourcesLimit A list that contains the resource limits for the
|
||||
* GLSL compiler
|
||||
* @return The compiled SPIR-V binary in unsigned int32 format
|
||||
*/
|
||||
static std::vector<uint32_t> compileSource(
|
||||
const std::string& source,
|
||||
const std::string& entryPoint = "main",
|
||||
std::vector<std::pair<std::string, std::string>> definitions = {},
|
||||
const TBuiltInResource& resources = Shader::defaultResource);
|
||||
const std::string& source);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue