[Mesa-dev] [PATCH crucible 1/3] amd: common functions for amd extension tests
Daniel Schürmann
daniel.schuermann at campus.tu-berlin.de
Fri Feb 23 23:40:15 UTC 2018
From: Bas Nieuwenhuizen <basni at chromium.org>
Co-authored-by: Daniel Schürmann <daniel.schuermann at campus.tu-berlin.de>
Signed-off-by: Daniel Schürmann <daniel.schuermann at campus.tu-berlin.de>
---
Makefile.am | 3 ++
src/tests/func/amd/amd_common.c | 115 ++++++++++++++++++++++++++++++++++++++++
src/tests/func/amd/amd_common.h | 53 ++++++++++++++++++
3 files changed, 171 insertions(+)
create mode 100644 src/tests/func/amd/amd_common.c
create mode 100644 src/tests/func/amd/amd_common.h
diff --git a/Makefile.am b/Makefile.am
index 6c144dd..515bedf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,6 +75,7 @@ bin_crucible_SOURCES = \
src/tests/example/basic.c \
src/tests/example/images.c \
src/tests/example/messages.c \
+ src/tests/func/amd/amd_common.c \
src/tests/func/cmd-buffer/secondary.c \
src/tests/func/copy/copy-buffer.c \
src/tests/func/4-vertex-buffers.c \
@@ -139,6 +140,8 @@ BUILT_SOURCES = \
src/tests/func/miptree/miptree-spirv.h \
src/tests/func/miptree/miptree_gen.c \
src/tests/func/push-constants/basic-spirv.h \
+ src/tests/func/amd/gcn_shader-spirv.h \
+ src/tests/func/amd/shader_trinary_minmax-spirv.h \
src/tests/func/shader/fragcoord-spirv.h \
src/tests/func/shader/pack_unpack-spirv.h \
src/tests/func/shader_ballot/ext_shader_ballot-spirv.h \
diff --git a/src/tests/func/amd/amd_common.c b/src/tests/func/amd/amd_common.c
new file mode 100644
index 0000000..aea9502
--- /dev/null
+++ b/src/tests/func/amd/amd_common.c
@@ -0,0 +1,115 @@
+// Copyright 2018 Google LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of the
+// Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#include "tapi/t.h"
+#include "amd_common.h"
+
+VkDeviceMemory
+common_init(VkShaderModule cs, const uint32_t ssbo_size)
+{
+ VkDescriptorSetLayout set_layout;
+
+ set_layout = qoCreateDescriptorSetLayout(t_device,
+ .bindingCount = 1,
+ .pBindings = (VkDescriptorSetLayoutBinding[]) {
+ {
+ .binding = 0,
+ .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+ .descriptorCount = 1,
+ .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
+ .pImmutableSamplers = NULL,
+ },
+ });
+
+ VkPipelineLayout pipeline_layout = qoCreatePipelineLayout(t_device,
+ .setLayoutCount = 1,
+ .pSetLayouts = &set_layout,
+ .pushConstantRangeCount = 0);
+
+ VkPipeline pipeline;
+ vkCreateComputePipelines(t_device, t_pipeline_cache, 1,
+ &(VkComputePipelineCreateInfo) {
+ .sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,
+ .pNext = NULL,
+ .stage = {
+ .stage = VK_SHADER_STAGE_COMPUTE_BIT,
+ .module = cs,
+ .pName = "main",
+ },
+ .flags = 0,
+ .layout = pipeline_layout
+ }, NULL, &pipeline);
+
+ VkDescriptorSet set =
+ qoAllocateDescriptorSet(t_device,
+ .descriptorPool = t_descriptor_pool,
+ .pSetLayouts = &set_layout);
+
+ VkBuffer buffer_out = qoCreateBuffer(t_device, .size = ssbo_size);
+ VkDeviceMemory mem_out = qoAllocBufferMemory(t_device, buffer_out,
+ .properties = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
+ qoBindBufferMemory(t_device, buffer_out, mem_out, 0);
+
+ vkUpdateDescriptorSets(t_device,
+ /*writeCount*/ 1,
+ (VkWriteDescriptorSet[]) {
+ {
+ .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+ .dstSet = set,
+ .dstBinding = 0,
+ .dstArrayElement = 0,
+ .descriptorCount = 1,
+ .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+ .pBufferInfo = &(VkDescriptorBufferInfo) {
+ .buffer = buffer_out,
+ .offset = 0,
+ .range = ssbo_size,
+ },
+ },
+ }, 0, NULL);
+
+ vkCmdBindPipeline(t_cmd_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline);
+
+ vkCmdBindDescriptorSets(t_cmd_buffer,
+ VK_PIPELINE_BIND_POINT_COMPUTE,
+ pipeline_layout, 0, 1,
+ &set, 0, NULL);
+
+ return mem_out;
+}
+
+void
+dispatch_and_wait(uint32_t x, uint32_t y, uint32_t z)
+{
+ vkCmdDispatch(t_cmd_buffer, x, y, z);
+ VkMemoryBarrier memoryBarrier = {
+ VK_STRUCTURE_TYPE_MEMORY_BARRIER,
+ NULL,
+ VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT,
+ VK_ACCESS_HOST_READ_BIT
+ };
+ vkCmdPipelineBarrier(t_cmd_buffer, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+ VK_PIPELINE_STAGE_HOST_BIT, 0, 1, &memoryBarrier, 0, NULL, 0, NULL);
+
+ qoEndCommandBuffer(t_cmd_buffer);
+ qoQueueSubmit(t_queue, 1, &t_cmd_buffer, VK_NULL_HANDLE);
+ qoQueueWaitIdle(t_queue);
+}
diff --git a/src/tests/func/amd/amd_common.h b/src/tests/func/amd/amd_common.h
new file mode 100644
index 0000000..ecb7fd6
--- /dev/null
+++ b/src/tests/func/amd/amd_common.h
@@ -0,0 +1,53 @@
+// Copyright 2018 Google LLC
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of the
+// Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#ifndef AMD_COMMON_H
+#define AMD_COMMON_H
+
+VkDeviceMemory
+common_init(VkShaderModule cs, const uint32_t ssbo_size);
+
+void
+dispatch_and_wait(uint32_t x, uint32_t y, uint32_t z);
+
+#define RUN_CASES(type, printf_identifier) { \
+ const unsigned case_count = sizeof(cases) / sizeof(cases[0]); \
+ const uint32_t ssbo_size = 16 * case_count; \
+ VkDeviceMemory mem = common_init(cs, ssbo_size); \
+ type *map = qoMapMemory(t_device, mem, 0, ssbo_size, 0); \
+ \
+ for (unsigned i = 0; i < case_count; ++i) { \
+ for (unsigned j = 0; j < 3; ++j) \
+ map[4 * i+ j] = cases[i].params[j]; \
+ map[4 * i + 3] = 4356; /* Something to prevent the initial value form matching */ \
+ } \
+ dispatch_and_wait(case_count, 1, 1); \
+ \
+ for (unsigned i = 0; i < case_count; i++) { \
+ t_assertf(map[4 * i + 3] == cases[i].result, \
+ "buffer mismatch at case %d: found " printf_identifier ", " \
+ "expected " printf_identifier, i, map[4 * i + 3], cases[i].result); \
+ } \
+ t_pass(); \
+}
+
+
+#endif // AMD_COMMON_H
--
2.14.1
More information about the mesa-dev
mailing list