Skip to content

[ET-VK][ez] Empty initialize ShaderInfo and add bool() operator #4842

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
merged 2 commits into from
Aug 22, 2024
Merged

[ET-VK][ez] Empty initialize ShaderInfo and add bool() operator #4842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a6cc2a
[ET-VK][ez] Introduce `check_close` function in `compute_api_test` to…
SS-JIA Aug 22, 2024
f13eede
[ET-VK][ez] Empty initialize ShaderInfo and add `bool()` operator
SS-JIA Aug 22, 2024
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
8 changes: 6 additions & 2 deletions backends/vulkan/runtime/vk_api/Shader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class ShaderLayout final {

struct ShaderInfo final {
struct {
const uint32_t* bin;
uint32_t size;
const uint32_t* bin = nullptr;
uint32_t size = 0u;
} src_code;

std::string kernel_name{""};
Expand All @@ -71,6 +71,10 @@ struct ShaderInfo final {
const uint32_t,
std::vector<VkDescriptorType>,
const utils::uvec3 tile_size);

operator bool() const {
return src_code.bin != nullptr;
};
};

bool operator==(const ShaderInfo& _1, const ShaderInfo& _2);
Expand Down
6 changes: 6 additions & 0 deletions backends/vulkan/test/utils/test_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,3 +482,9 @@ void execute_graph_and_check_output(
}
}
}

bool check_close(float a, float b, float atol, float rtol) {
float max = std::max(std::abs(a), std::abs(b));
float diff = std::abs(a - b);
return diff <= (atol + rtol * max);
}
6 changes: 6 additions & 0 deletions backends/vulkan/test/utils/test_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,9 @@ void print_vector(
}
std::cout << std::endl;
}

//
// Misc. Utilities
//

bool check_close(float a, float b, float atol = 1e-4, float rtol = 1e-5);
9 changes: 8 additions & 1 deletion backends/vulkan/test/vulkan_compute_api_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,13 @@ std::vector<int64_t> get_reference_strides(
return {};
}

TEST_F(VulkanComputeAPITest, empty_init_shader_info_test) {
vkapi::ShaderInfo empty_shader_info;
EXPECT_FALSE(empty_shader_info);
EXPECT_TRUE(empty_shader_info.src_code.bin == nullptr);
EXPECT_TRUE(empty_shader_info.src_code.size == 0u);
}

TEST_F(VulkanComputeAPITest, calculate_tensor_strides_test) {
for (const auto& sizes : standard_sizes_to_test) {
if (sizes.size() < 3) {
Expand Down Expand Up @@ -601,7 +608,7 @@ TEST_F(VulkanComputeAPITest, tensor_no_copy_transpose_test) {
EXPECT_TRUE(data_out.size() == ref_out.size());

for (size_t i = 0; i < data_out.size(); ++i) {
EXPECT_TRUE(data_out[i] == ref_out[i]);
EXPECT_TRUE(check_close(data_out[i], ref_out[i]));
}
}

Expand Down