TEST/GTEST: Disable tag matching offload tests

Author: yosefe

test/gtest/common/test.cc

@@ -40,13 +40,16 @@ test_base::~test_base() {
     }
     ucs_assertv_always(m_state == FINISHED ||
                        m_state == SKIPPED ||
-                       m_state == NEW ||    /* can be skipped from a class constructor */
+                       m_state == NEW ||
+                       m_state == INITIALIZING ||
                        m_state == ABORTED,
                        "state=%d", m_state);
 }
 
 void test_base::set_num_threads(unsigned num_threads) {
-    if (m_state != NEW) {
+    if (m_state == SKIPPED) {
+        return;
+    } else if (m_state != NEW) {
         GTEST_FAIL() << "Cannot modify number of threads after test is started, "
                      << "it must be done in the constructor.";
     }
@@ -311,6 +314,10 @@ unsigned test_base::num_warnings()
 }
 
 void test_base::SetUpProxy() {
+    if (m_state == SKIPPED) {
+        return;
+    }
+
     ucs_assert(m_state == NEW);
     m_num_valgrind_errors_before = VALGRIND_COUNT_ERRORS;
     m_num_warnings_before        = m_total_warnings;
@@ -324,6 +331,7 @@ void test_base::SetUpProxy() {
 
     try {
         check_skip_test();
+        m_state = INITIALIZING;
         init();
         m_initialized = true;
         m_state       = RUNNING;
@@ -427,7 +435,10 @@ void test_base::TestBodyProxy() {
 }
 
 void test_base::skipped(const test_skip_exception& e) {
-    std::string reason = e.what();
+    skipped(e.what());
+}
+
+void test_base::skipped(const std::string& reason) {
     if (reason.empty()) {
         detail::message_stream("SKIP");
     } else {
@@ -459,6 +470,14 @@ bool test_base::barrier() {
     }
 }
 
+void test_base::test_skip(const std::string& reason) {
+    if (m_state == NEW) {
+        skipped(reason); // Do not throw exception from the constructor
+    } else if (m_state != SKIPPED) {
+        throw test_skip_exception(reason);
+    }
+}
+
 static void clear_dontcopy_regions_vma_cb(ucs_sys_vma_info_t *info, void *ctx) {
     int ret;
 

test/gtest/common/test.h

@@ -70,7 +70,12 @@ class test_base {
     };
 
     typedef enum {
-        NEW, RUNNING, SKIPPED, ABORTED, FINISHED
+        NEW,
+        INITIALIZING,
+        RUNNING,
+        SKIPPED,
+        ABORTED,
+        FINISHED
     } state_t;
 
     typedef std::vector<ucs_global_opts_t> config_stack_t;
@@ -85,6 +90,7 @@ class test_base {
     virtual void cleanup();
     virtual void init();
     bool barrier();
+    void test_skip(const std::string &reason = "");
 
     virtual void check_skip_test() = 0;
 
@@ -174,6 +180,7 @@ class test_base {
     static std::vector<std::string> m_first_warns_and_errors;
 
 private:
+    void skipped(const std::string &reason);
     void skipped(const test_skip_exception& e);
     void run();
     static void push_debug_message_with_limit(std::vector<std::string>& vec,

test/gtest/common/test_helpers.cc

@@ -924,4 +924,10 @@ void skip_on_address_sanitizer()
 #endif
 }
 
+bool skip_hw_tm_offload()
+{
+    // Skip HW TM offload tests due to issue RM4602065
+    return true;
+}
+
 } // ucs

test/gtest/common/test_helpers.h

@@ -1056,6 +1056,13 @@ const std::vector<std::vector<ucs_memory_type_t> >& supported_mem_type_pairs();
  */
 void skip_on_address_sanitizer();
 
+
+/**
+ * Returns whether to skip HW TM offload tests
+ */
+bool skip_hw_tm_offload();
+
+
 /**
  * Class for mocking C function pointers
  * The class is used to mock C function pointers, by replacing the original

test/gtest/ucp/test_ucp_tag.cc

@@ -56,6 +56,9 @@ void test_ucp_tag::init()
 
 void test_ucp_tag::enable_tag_mp_offload()
 {
+    if (ucs::skip_hw_tm_offload()) {
+        test_skip();
+    }
     m_env.push_back(new ucs::scoped_setenv("UCX_RC_TM_ENABLE", "y"));
     m_env.push_back(new ucs::scoped_setenv("UCX_RC_TM_MP_SRQ_ENABLE", "try"));
     m_env.push_back(new ucs::scoped_setenv("UCX_RC_TM_MP_NUM_STRIDES", "8"));
@@ -425,6 +428,9 @@ class test_ucp_tag_limits : public test_ucp_tag {
     test_ucp_tag_limits() {
         m_test_offload = get_variant_value();
         if (m_test_offload) {
+            if (ucs::skip_hw_tm_offload()) {
+                test_skip();
+            }
             m_env.push_back(new ucs::scoped_setenv("UCX_RC_TM_ENABLE", "y"));
         }
         m_tag_min_rndv = 0;

test/gtest/ucp/test_ucp_tag_offload.cc

@@ -593,6 +593,9 @@ UCP_INSTANTIATE_TEST_CASE_TLS(test_ucp_tag_offload_multi, all_rcdc, "rc,dc")
 class test_ucp_tag_offload_selection : public test_ucp_tag_offload {
 public:
     test_ucp_tag_offload_selection() {
+        if (ucs::skip_hw_tm_offload()) {
+            test_skip();
+        }
         m_env.push_back(new ucs::scoped_setenv("UCX_RC_TM_ENABLE", "y"));
     }
 
@@ -708,6 +711,9 @@ UCP_INSTANTIATE_TEST_CASE_TLS_GPU_AWARE(test_ucp_tag_offload_gpu, rc_dc_gpu,
 class test_ucp_tag_offload_status : public test_ucp_tag {
 public:
     test_ucp_tag_offload_status() {
+        if (ucs::skip_hw_tm_offload()) {
+            test_skip();
+        }
         m_env.push_back(new ucs::scoped_setenv("UCX_RC_TM_ENABLE", "y"));
     }
 

test/gtest/uct/ib/test_rc.cc

@@ -289,7 +289,9 @@ class test_rc_get_limit : public test_rc {
             modify_config("RC_TX_QUEUE_LEN", "32");
         }
 
-        modify_config("RC_TM_ENABLE", "y", SETENV_IF_NOT_EXIST);
+        if (!ucs::skip_hw_tm_offload()) {
+            modify_config("RC_TM_ENABLE", "y", SETENV_IF_NOT_EXIST);
+        }
 
         m_comp.func   = NULL;
         m_comp.count  = 300000; // some big value to avoid func invocation

test/gtest/uct/test_tag.cc

@@ -54,6 +54,9 @@ class test_tag : public uct_test {
 
     void init()
     {
+        if (ucs::skip_hw_tm_offload()) {
+            test_skip();
+        }
         ucs_status_t status = uct_config_modify(m_iface_config,
                                                 "RC_TM_ENABLE", "y");
         ASSERT_TRUE((status == UCS_OK) || (status == UCS_ERR_NO_ELEM));
@@ -1015,6 +1018,9 @@ void test_tag_mp_xrq::set_env_var_or_skip(void *config, const char *var,
 
 void test_tag_mp_xrq::init()
 {
+    if (ucs::skip_hw_tm_offload()) {
+        test_skip();
+    }
     set_env_var_or_skip(m_iface_config, "RC_TM_ENABLE", "y");
     set_env_var_or_skip(m_iface_config, "RC_TM_MP_SRQ_ENABLE", "try");
     set_env_var_or_skip(m_iface_config, "RC_TM_MP_NUM_STRIDES", "8");