Updated testopshaders
This commit is contained in:
parent
08a5543c5d
commit
2b09c551e7
1 changed files with 63 additions and 54 deletions
|
|
@ -5,60 +5,69 @@
|
||||||
|
|
||||||
#include "kompute_test/shaders/shadertest_op_custom_shader.hpp"
|
#include "kompute_test/shaders/shadertest_op_custom_shader.hpp"
|
||||||
|
|
||||||
//TEST(TestOpAlgoCreate, ShaderRawDataFromConstructor)
|
TEST(TestOpAlgoCreate, ShaderRawDataFromConstructor)
|
||||||
//{
|
{
|
||||||
// kp::Manager mgr;
|
kp::Manager mgr;
|
||||||
//
|
|
||||||
// std::shared_ptr<kp::Tensor> tensorA{ new kp::Tensor({ 3, 4, 5 }) };
|
std::shared_ptr<kp::Tensor> tensorA = mgr.tensor({ 3, 4, 5 });
|
||||||
// std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor({ 0, 0, 0 }) };
|
std::shared_ptr<kp::Tensor> tensorB = mgr.tensor({ 0, 0, 0 });
|
||||||
// mgr.rebuild({ tensorA, tensorB });
|
|
||||||
//
|
std::string shader(R"(
|
||||||
// std::string shader(R"(
|
#version 450
|
||||||
// #version 450
|
|
||||||
//
|
layout (local_size_x = 1) in;
|
||||||
// layout (local_size_x = 1) in;
|
|
||||||
//
|
layout(set = 0, binding = 0) buffer a { float pa[]; };
|
||||||
// layout(set = 0, binding = 0) buffer a { float pa[]; };
|
layout(set = 0, binding = 1) buffer b { float pb[]; };
|
||||||
// layout(set = 0, binding = 1) buffer b { float pb[]; };
|
|
||||||
//
|
void main() {
|
||||||
// void main() {
|
uint index = gl_GlobalInvocationID.x;
|
||||||
// uint index = gl_GlobalInvocationID.x;
|
pb[index] = pa[index];
|
||||||
// pb[index] = pa[index];
|
pa[index] = index;
|
||||||
// pa[index] = index;
|
}
|
||||||
// }
|
)");
|
||||||
// )");
|
|
||||||
//
|
std::vector<uint32_t> spirv = kp::Shader::compile_source(shader);
|
||||||
// mgr.evalOpDefault<kp::OpAlgoCreate>(
|
|
||||||
// { tensorA, tensorB }, kp::Shader::compile_source(shader));
|
std::vector<std::shared_ptr<kp::Tensor>> params = { tensorA, tensorB };
|
||||||
//
|
|
||||||
// mgr.evalOpDefault<kp::OpTensorSyncLocal>({ tensorA, tensorB });
|
mgr.sequence()
|
||||||
//
|
->eval<kp::OpTensorSyncDevice>(params)
|
||||||
// EXPECT_EQ(tensorA->data(), std::vector<float>({ 0, 1, 2 }));
|
->eval<kp::OpAlgoDispatch>(mgr.algorithm(params, spirv))
|
||||||
// EXPECT_EQ(tensorB->data(), std::vector<float>({ 3, 4, 5 }));
|
->eval<kp::OpTensorSyncLocal>(params);
|
||||||
//}
|
|
||||||
//
|
|
||||||
//TEST(TestOpAlgoCreate, ShaderCompiledDataFromConstructor)
|
EXPECT_EQ(tensorA->data(), std::vector<float>({ 0, 1, 2 }));
|
||||||
//{
|
EXPECT_EQ(tensorB->data(), std::vector<float>({ 3, 4, 5 }));
|
||||||
// kp::Manager mgr;
|
}
|
||||||
//
|
|
||||||
// std::shared_ptr<kp::Tensor> tensorA{ new kp::Tensor({ 3, 4, 5 }) };
|
TEST(TestOpAlgoCreate, ShaderCompiledDataFromConstructor)
|
||||||
// std::shared_ptr<kp::Tensor> tensorB{ new kp::Tensor({ 0, 0, 0 }) };
|
{
|
||||||
// mgr.rebuild({ tensorA, tensorB });
|
kp::Manager mgr;
|
||||||
//
|
|
||||||
// mgr.evalOpDefault<kp::OpAlgoCreate>(
|
std::shared_ptr<kp::Tensor> tensorA = mgr.tensor({ 3, 4, 5 });
|
||||||
// { tensorA, tensorB },
|
std::shared_ptr<kp::Tensor> tensorB = mgr.tensor({ 0, 0, 0 });
|
||||||
// std::vector<uint32_t>(
|
|
||||||
// (uint32_t*)kp::shader_data::test_shaders_glsl_test_op_custom_shader_comp_spv,
|
std::vector<uint32_t> spirv =
|
||||||
// (uint32_t*)(kp::shader_data::test_shaders_glsl_test_op_custom_shader_comp_spv +
|
std::vector<uint32_t>(
|
||||||
// kp::shader_data::
|
(uint32_t*)kp::shader_data::test_shaders_glsl_test_op_custom_shader_comp_spv,
|
||||||
// test_shaders_glsl_test_op_custom_shader_comp_spv_len)));
|
(uint32_t*)(kp::shader_data::test_shaders_glsl_test_op_custom_shader_comp_spv +
|
||||||
//
|
kp::shader_data::
|
||||||
// mgr.evalOpDefault<kp::OpTensorSyncLocal>({ tensorA, tensorB });
|
test_shaders_glsl_test_op_custom_shader_comp_spv_len));
|
||||||
//
|
|
||||||
// EXPECT_EQ(tensorA->data(), std::vector<float>({ 0, 1, 2 }));
|
std::vector<std::shared_ptr<kp::Tensor>> params = { tensorA, tensorB };
|
||||||
// EXPECT_EQ(tensorB->data(), std::vector<float>({ 3, 4, 5 }));
|
|
||||||
//}
|
mgr.sequence()
|
||||||
//
|
->eval<kp::OpTensorSyncDevice>(params)
|
||||||
|
->eval<kp::OpAlgoDispatch>(mgr.algorithm(params, spirv))
|
||||||
|
->eval<kp::OpTensorSyncLocal>(params);
|
||||||
|
|
||||||
|
|
||||||
|
EXPECT_EQ(tensorA->data(), std::vector<float>({ 0, 1, 2 }));
|
||||||
|
EXPECT_EQ(tensorB->data(), std::vector<float>({ 3, 4, 5 }));
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Add support to read from file for shader
|
||||||
//TEST(TestOpAlgoCreate, ShaderCompiledDataFromFile)
|
//TEST(TestOpAlgoCreate, ShaderCompiledDataFromFile)
|
||||||
//{
|
//{
|
||||||
// kp::Manager mgr;
|
// kp::Manager mgr;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue