Skip to content

Commit 66ba207

Browse files
authored
Merge pull request #10614 from rakhmets/topic/test-ucp-perf-skip-check-1.18
GTEST/UCP: Disabled checking the values in test_ucp_perf.envelope - v1.18.x
2 parents ed8588d + 74a01e1 commit 66ba207

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

test/gtest/ucp/test_ucp_perf.cc

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ extern "C" {
1616
}
1717

1818
#define MB pow(1024.0, -2)
19-
#define UCT_PERF_TEST_MULTIPLIER 5
20-
#define UCT_ARM_PERF_TEST_MULTIPLIER 15
2119

2220
class test_ucp_perf : public ucp_test, public test_perf {
2321
public:
@@ -326,12 +324,10 @@ const size_t test_ucp_perf::tests_num = ucs_static_array_size(test_ucp_perf::tes
326324

327325
UCS_TEST_SKIP_COND_P(test_ucp_perf, envelope, has_transport("self"))
328326
{
329-
bool check_perf = true;
330327
size_t max_iter = std::numeric_limits<size_t>::max();
331328
test_spec test = tests[get_variant_value(VARIANT_TEST_TYPE)];
332329

333330
if (has_transport("tcp")) {
334-
check_perf = false;
335331
max_iter = 1000lu;
336332
}
337333

@@ -351,19 +347,11 @@ UCS_TEST_SKIP_COND_P(test_ucp_perf, envelope, has_transport("self"))
351347
/* coverity[tainted_string_argument] */
352348
ucs::scoped_setenv atomic_mode("UCX_ATOMIC_MODE", atomic_mode_str);
353349

354-
if (ucs_arch_get_cpu_model() == UCS_CPU_MODEL_ARM_AARCH64) {
355-
test.max *= UCT_ARM_PERF_TEST_MULTIPLIER;
356-
test.min /= UCT_ARM_PERF_TEST_MULTIPLIER;
357-
} else {
358-
test.max *= UCT_PERF_TEST_MULTIPLIER;
359-
test.min /= UCT_PERF_TEST_MULTIPLIER;
360-
}
361-
test.iters = ucs_min(test.iters, max_iter);
362-
350+
test.iters = ucs_min(test.iters, max_iter);
363351
test.send_mem_type = UCS_MEMORY_TYPE_HOST;
364352
test.recv_mem_type = UCS_MEMORY_TYPE_HOST;
365353

366-
run_test(test, 0, check_perf, "", "");
354+
run_test(test, 0, false, "", "");
367355
}
368356

369357
UCP_INSTANTIATE_TEST_CASE(test_ucp_perf)

0 commit comments

Comments
 (0)