Skip to content
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

tests: Fix tests failing on RADV ToT #9359

Merged
merged 1 commit into from
Jan 31, 2025
Merged

tests: Fix tests failing on RADV ToT #9359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions tests/unit/dynamic_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5682,6 +5682,9 @@ TEST_F(NegativeDynamicState, RebindSamePipeline) {
(driver_properties.conformanceVersion.minor == 3 && driver_properties.conformanceVersion.subminor > 7)) {
GTEST_SKIP() << "conformanceVersion is greater than the version the test requires";
}
if (driver_properties.conformanceVersion.major == 0) {
GTEST_SKIP() << "conformanceVersion is invalid"; // happens in some non-conformant mesa drivers
}

CreatePipelineHelper pipe(*this);
pipe.CreateGraphicsPipeline();
Expand Down
14 changes: 9 additions & 5 deletions tests/unit/shader_cooperative_matrix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Copyright (c) 2015-2024 The Khronos Group Inc.
* Copyright (c) 2015-2024 Valve Corporation
* Copyright (c) 2015-2024 LunarG, Inc.
* Copyright (c) 2015-2024 Google, Inc.
* Copyright (c) 2015-2025 The Khronos Group Inc.
* Copyright (c) 2015-2025 Valve Corporation
* Copyright (c) 2015-2025 LunarG, Inc.
* Copyright (c) 2015-2025 Google, Inc.
* Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -553,10 +553,14 @@ TEST_F(NegativeShaderCooperativeMatrix, MatchSizeWithProperties) {
RETURN_IF_SKIP(InitCooperativeMatrixKHR());

VkPhysicalDeviceCooperativeMatrixPropertiesKHR props = vku::InitStructHelper();
GetPhysicalDeviceProperties2(props);
VkPhysicalDeviceVulkan11Properties props11 = vku::InitStructHelper(&props);
GetPhysicalDeviceProperties2(props11);
if ((props.cooperativeMatrixSupportedStages & VK_SHADER_STAGE_COMPUTE_BIT) == 0) {
GTEST_SKIP() << "Compute stage is not supported";
}
if (props11.subgroupSize > 32) {
GTEST_SKIP() << "local_size_x (32) is not a multiple of subgroupSize";
}

if (HasValidProperty(VK_SCOPE_SUBGROUP_KHR, 8, 8, 16, VK_COMPONENT_TYPE_FLOAT16_KHR)) {
GTEST_SKIP() << "Valid Property found, need invalid to test";
Expand Down