Skip to content

Add support for new clspv interface types #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-baker merged 4 commits into from
Apr 8, 2020
Merged

Add support for new clspv interface types #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c57989b
Add support for new clspv interface types
alan-baker Apr 7, 2020
ca3c64f
Update clspv deps
alan-baker Apr 7, 2020
4995a16
Revert uninitentional change
alan-baker Apr 7, 2020
5a2e6f0
fix build
alan-baker Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ vars = {
'nlohmann_git': 'https://github.com/nlohmann',
'swiftshader_git': 'https://swiftshader.googlesource.com',

'clspv_llvm_revision': '627e01feb718dd1aa8e184545976b7229de312a2',
'clspv_revision': '1356838737b0fbe1f3b9d0744df46ebc716d7b5c',
'clspv_llvm_revision': 'a2bb19ca420d0801f5b9a5363dec1d7bcb829030',
'clspv_revision': '4e6c283e15420ba6e949d44850929b8d78b45ad9',
'cppdap_revision': '4dcca5775616ada2796ff7f84c3a4843eee9b506',
'cpplint_revision': '26470f9ccb354ff2f6d098f831271a1833701b28',
'dxc_revision': 'ef73f1da8ad79a42405e8c75cf7d66ed8a0bb345',
Expand Down
12 changes: 9 additions & 3 deletions src/clspv_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ Result Compile(Pipeline::ShaderInfo* shader_info,
descriptor_entry.kind =
Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD_UBO;
break;
case clspv::ArgKind::PodPushConstant:
descriptor_entry.kind =
Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD_PUSHCONSTANT;
break;
case clspv::ArgKind::ReadOnlyImage:
descriptor_entry.kind =
Pipeline::ShaderInfo::DescriptorMapEntry::Kind::RO_IMAGE;
Expand All @@ -84,7 +88,8 @@ Result Compile(Pipeline::ShaderInfo* shader_info,
}

if (entry.kernel_arg_data.arg_kind == clspv::ArgKind::Pod ||
entry.kernel_arg_data.arg_kind == clspv::ArgKind::PodUBO) {
entry.kernel_arg_data.arg_kind == clspv::ArgKind::PodUBO ||
entry.kernel_arg_data.arg_kind == clspv::ArgKind::PodPushConstant) {
descriptor_entry.pod_offset = entry.kernel_arg_data.pod_offset;
descriptor_entry.pod_arg_size = entry.kernel_arg_data.pod_arg_size;
}
Expand Down Expand Up @@ -112,11 +117,12 @@ Result Compile(Pipeline::ShaderInfo* shader_info,
push_constant.offset = entry.push_constant_data.offset;
push_constant.size = entry.push_constant_data.size;
shader_info->AddPushConstant(std::move(push_constant));
} else {
assert(entry.kind == clspv::version0::DescriptorMapEntry::Sampler);
} else if (entry.kind == clspv::version0::DescriptorMapEntry::Sampler) {
// Create a new sampler info.
pipeline->AddSampler(entry.sampler_data.mask, entry.descriptor_set,
entry.binding);
} else if (entry.kind == clspv::version0::DescriptorMapEntry::KernelDecl) {
// Nothing to do for declarations.
}
}

Expand Down
212 changes: 117 additions & 95 deletions src/pipeline.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,28 @@ Result Pipeline::SetPushConstantBuffer(Buffer* buf) {
return {};
}

Result Pipeline::CreatePushConstantBuffer() {
if (push_constant_buffer_.buffer != nullptr)
return Result("can only bind one push constant buffer in a PIPELINE");

TypeParser parser;
auto type = parser.Parse("R8_UINT");
auto fmt = MakeUnique<Format>(type.get());

std::unique_ptr<Buffer> buf = MakeUnique<Buffer>();
buf->SetName(kGeneratedPushConstantBuffer);
buf->SetFormat(fmt.get());

push_constant_buffer_.buffer = buf.get();
push_constant_buffer_.type = BufferType::kPushConstant;

formats_.push_back(std::move(fmt));
types_.push_back(std::move(type));
opencl_push_constants_ = std::move(buf);

return {};
}

std::unique_ptr<Buffer> Pipeline::GenerateDefaultColorAttachmentBuffer() {
TypeParser parser;
auto type = parser.Parse(kDefaultColorBufferFormat);
Expand Down Expand Up @@ -664,7 +686,9 @@ Result Pipeline::GenerateOpenCLPodBuffers() {
for (const auto& entry : iter->second) {
if (entry.kind != Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD &&
entry.kind !=
Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD_UBO) {
Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD_UBO &&
entry.kind != Pipeline::ShaderInfo::DescriptorMapEntry::Kind::
POD_PUSHCONSTANT) {
continue;
}

Expand All @@ -680,81 +704,91 @@ Result Pipeline::GenerateOpenCLPodBuffers() {
}
}

if (descriptor_set == std::numeric_limits<uint32_t>::max() ||
binding == std::numeric_limits<uint32_t>::max()) {
std::string message =
"could not find descriptor map entry for SET command: kernel " +
shader_info.GetEntryPoint();
if (uses_name) {
message += ", name " + arg_info.name;
} else {
message += ", number " + std::to_string(arg_info.ordinal);
}
return Result(message);
}

auto buf_iter = opencl_pod_buffer_map_.lower_bound(
std::make_pair(descriptor_set, binding));
Buffer* buffer = nullptr;
if (buf_iter == opencl_pod_buffer_map_.end() ||
buf_iter->first.first != descriptor_set ||
buf_iter->first.second != binding) {
// Ensure no buffer was previously bound for this descriptor set and
// binding pair.
for (const auto& buf_info : GetBuffers()) {
if (buf_info.descriptor_set == descriptor_set &&
buf_info.binding == binding) {
return Result("previously bound buffer " +
buf_info.buffer->GetName() +
" to PoD args at descriptor set " +
std::to_string(descriptor_set) + " binding " +
std::to_string(binding));
}
if (kind ==
Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD_PUSHCONSTANT) {
if (GetPushConstantBuffer().buffer == nullptr) {
auto r = CreatePushConstantBuffer();
if (!r.IsSuccess())
return r;
}

// Add a new buffer for this descriptor set and binding.
opencl_pod_buffers_.push_back(MakeUnique<Buffer>());
buffer = opencl_pod_buffers_.back().get();
auto buffer_type =
kind == Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD
? BufferType::kStorage
: BufferType::kUniform;

// Use an 8-bit type because all the data in the descriptor map is
// byte-based and it simplifies the logic for sizing below.
TypeParser parser;
auto type = parser.Parse("R8_UINT");
auto fmt = MakeUnique<Format>(type.get());
buffer->SetFormat(fmt.get());
formats_.push_back(std::move(fmt));
types_.push_back(std::move(type));

buffer->SetName(GetName() + "_pod_buffer_" +
std::to_string(descriptor_set) + "_" +
std::to_string(binding));
opencl_pod_buffer_map_.insert(
buf_iter,
std::make_pair(std::make_pair(descriptor_set, binding), buffer));
AddBuffer(buffer, buffer_type, descriptor_set, binding, 0);
buffer = GetPushConstantBuffer().buffer;
} else {
buffer = buf_iter->second;
}
if (descriptor_set == std::numeric_limits<uint32_t>::max() ||
binding == std::numeric_limits<uint32_t>::max()) {
std::string message =
"could not find descriptor map entry for SET command: kernel " +
shader_info.GetEntryPoint();
if (uses_name) {
message += ", name " + arg_info.name;
} else {
message += ", number " + std::to_string(arg_info.ordinal);
}
return Result(message);
}

// Resize if necessary.
if (buffer->ValueCount() < offset + arg_size) {
buffer->SetSizeInElements(offset + arg_size);
}
auto buf_iter = opencl_pod_buffer_map_.lower_bound(
std::make_pair(descriptor_set, binding));
if (buf_iter == opencl_pod_buffer_map_.end() ||
buf_iter->first.first != descriptor_set ||
buf_iter->first.second != binding) {
// Ensure no buffer was previously bound for this descriptor set and
// binding pair.
for (const auto& buf_info : GetBuffers()) {
if (buf_info.descriptor_set == descriptor_set &&
buf_info.binding == binding) {
return Result("previously bound buffer " +
buf_info.buffer->GetName() +
" to PoD args at descriptor set " +
std::to_string(descriptor_set) + " binding " +
std::to_string(binding));
}
}

// Check the data size.
if (arg_size != arg_info.fmt->SizeInBytes()) {
std::string message = "SET command uses incorrect data size: kernel " +
shader_info.GetEntryPoint();
if (uses_name) {
message += ", name " + arg_info.name;
// Add a new buffer for this descriptor set and binding.
opencl_pod_buffers_.push_back(MakeUnique<Buffer>());
buffer = opencl_pod_buffers_.back().get();
auto buffer_type =
kind == Pipeline::ShaderInfo::DescriptorMapEntry::Kind::POD
? BufferType::kStorage
: BufferType::kUniform;

// Use an 8-bit type because all the data in the descriptor map is
// byte-based and it simplifies the logic for sizing below.
TypeParser parser;
auto type = parser.Parse("R8_UINT");
auto fmt = MakeUnique<Format>(type.get());
buffer->SetFormat(fmt.get());
formats_.push_back(std::move(fmt));
types_.push_back(std::move(type));

buffer->SetName(GetName() + "_pod_buffer_" +
std::to_string(descriptor_set) + "_" +
std::to_string(binding));
opencl_pod_buffer_map_.insert(
buf_iter,
std::make_pair(std::make_pair(descriptor_set, binding), buffer));
AddBuffer(buffer, buffer_type, descriptor_set, binding, 0);
} else {
message += ", number " + std::to_string(arg_info.ordinal);
buffer = buf_iter->second;
}

// Resize if necessary.
if (buffer->ValueCount() < offset + arg_size) {
buffer->SetSizeInElements(offset + arg_size);
}

// Check the data size.
if (arg_size != arg_info.fmt->SizeInBytes()) {
std::string message = "SET command uses incorrect data size: kernel " +
shader_info.GetEntryPoint();
if (uses_name) {
message += ", name " + arg_info.name;
} else {
message += ", number " + std::to_string(arg_info.ordinal);
}
return Result(message);
}
return Result(message);
}

// Convert the argument value into bytes. Currently, only scalar arguments
Expand Down Expand Up @@ -864,17 +898,23 @@ Result Pipeline::GenerateOpenCLPushConstants() {
if (shader_info.GetPushConstants().empty())
return {};

Result r = CreatePushConstantBuffer();
if (!r.IsSuccess())
return r;

auto* buf = GetPushConstantBuffer().buffer;
assert(buf);

// Determine size and contents of the push constant buffer.
std::vector<uint32_t> bytes;
for (const auto& pc : shader_info.GetPushConstants()) {
assert(pc.size % sizeof(uint32_t) == 0);
assert(pc.offset % sizeof(uint32_t) == 0);
uint32_t elements = (pc.offset + pc.size) / sizeof(uint32_t);
if (elements > bytes.size()) {
bytes.resize(elements);
}

uint32_t base = pc.offset / sizeof(uint32_t);
if (buf->GetSizeInBytes() < pc.offset + pc.size)
buf->SetSizeInBytes(pc.offset + pc.size);

std::vector<uint32_t> bytes(pc.size / sizeof(uint32_t));
uint32_t base = 0;
switch (pc.type) {
case Pipeline::ShaderInfo::PushConstant::PushConstantType::kDimensions:
// All compute kernel launches are 3D.
Expand All @@ -887,28 +927,10 @@ Result Pipeline::GenerateOpenCLPushConstants() {
bytes[base + 2] = 0;
break;
}
memcpy(buf->ValuePtr()->data() + pc.offset, bytes.data(),
bytes.size() * sizeof(uint32_t));
}

TypeParser parser;
auto type = parser.Parse("R8_UINT");
auto fmt = MakeUnique<Format>(type.get());

// Create buffer containing push constant data.
std::unique_ptr<Buffer> buf = MakeUnique<Buffer>();
buf->SetName(kGeneratedPushConstantBuffer);
buf->SetFormat(fmt.get());
buf->SetSizeInBytes(static_cast<uint32_t>(bytes.size() * sizeof(uint32_t)));
std::memcpy(buf->ValuePtr()->data(), bytes.data(),
bytes.size() * sizeof(uint32_t));

Result r = SetPushConstantBuffer(buf.get());
if (!r.IsSuccess())
return r;

formats_.push_back(std::move(fmt));
types_.push_back(std::move(type));
opencl_push_constants_ = std::move(buf);

return {};
}

Expand Down
3 changes: 3 additions & 0 deletions src/pipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class Pipeline {
UBO,
POD,
POD_UBO,
POD_PUSHCONSTANT,
RO_IMAGE,
WO_IMAGE,
SAMPLER,
Expand Down Expand Up @@ -344,6 +345,8 @@ class Pipeline {
private:
void UpdateFramebufferSizes();

Result CreatePushConstantBuffer();

Result ValidateGraphics() const;
Result ValidateCompute() const;

Expand Down
Loading