Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@
"Unit_Coalesced_Group_Tiled_Partition_Sync_Positive_Basic - uint8_t",
"Unit_Coalesced_Group_Tiled_Partition_Sync_Positive_Basic - uint16_t",
"Unit_Coalesced_Group_Tiled_Partition_Sync_Positive_Basic - uint32_t",
"=== SWDEV-444987 - Below tests fail in stress testing on 25/01/2023 ===",
"Unit_floatTM",
"Unit_TestMathFuncComplex",
"Unit_hipGraphAddMemcpyNodeToSymbol_Positive_Basic",
"Unit_hipStreamBeginCapture_Positive_Functional",
"Unit_Kernel_Launch_bounds_Negative_OutOfBounds",
"Unit_Kernel_Launch_bounds_Negative_Parameters_RTC",
"SWDEV-447384, SWDEV-447932: These tests fail in gfx1100, gfx1101 & gfx1102",
"SWDEV-445928: These tests fail in PSDB stress test on 09/02/2024",
"Unit_hipGraphInstantiateWithFlags_StreamCaptureDeviceContextChg",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ TEST_CASE("Unit_hipLaunchCooperativeKernelMultiDevice_Positive_Basic",
}

const auto device_count = HipTest::getDeviceCount();
if (device_count < 2) {
SUCCEED("Test requires at least 2 devices");
return;
}

std::vector<hipLaunchParams> params_list(device_count);

Expand Down Expand Up @@ -68,6 +72,10 @@ TEST_CASE("Unit_hipLaunchCooperativeKernelMultiDevice_Negative_Parameters",
}

const auto device_count = HipTest::getDeviceCount();
if (device_count < 2) {
SUCCEED("Test requires at least 2 devices");
return;
}

std::vector<hipLaunchParams> params_list(device_count);

Expand Down Expand Up @@ -144,6 +152,12 @@ TEST_CASE("Unit_hipLaunchCooperativeKernelMultiDevice_Negative_MultiKernelSameDe
return;
}

const auto device_count = HipTest::getDeviceCount();
if (device_count < 2) {
SUCCEED("Test requires at least 2 devices");
return;
}

HIP_CHECK(hipSetDevice(0));

std::vector<hipLaunchParams> params_list(2);
Expand Down
11 changes: 1 addition & 10 deletions projects/hip-tests/catch/unit/launchBounds/launch_bounds.cc
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,8 @@ TEST_CASE("Unit_Kernel_Launch_bounds_Negative_OutOfBounds") {
* ------------------------
* - Validates handling of invalid arguments:
* -# Compiles kernels that are not created appropriately:
* - Maximum number of threads is 0
* - Maximum number of threads is negative
* - Minimum number of warps is negative
* - Maximum number of threads is not integer value
* - Mimimum number of warps is not integer value
* - Minimum number of warps is not integer value
* -# Expected output: compiler error
* - Uses RTC for compilation.
* Test source
Expand All @@ -144,13 +141,7 @@ TEST_CASE("Unit_Kernel_Launch_bounds_Negative_OutOfBounds") {
TEST_CASE("Unit_Kernel_Launch_bounds_Negative_Parameters_RTC") {
hiprtcProgram program{};

#if HT_AMD
const auto program_source = GENERATE(kMaxThreadsZero, kMaxThreadsNegative, kMinWarpsNegative,
kMaxThreadsNotInt, kMinWarpsNotInt);
#else
// Aligned with CUDA behavior and expected behavior on NVIDIA
const auto program_source = GENERATE(kMaxThreadsNotInt, kMinWarpsNotInt);
#endif

HIPRTC_CHECK(hiprtcCreateProgram(&program, program_source, "launch_bounds_negative.cc", 0,
nullptr, nullptr));
Expand Down