Merge pull request #2646 from aarongreig/aaron/refactorKnownFailure

Refactor KNOWN_FAILURE implementation to avoid repeated logic.

Author: aarongreig

test/conformance/source/environment.cpp

@@ -152,16 +152,6 @@ void DevicesEnvironment::SetUp() {
   }
 }
 
-void DevicesEnvironment::TearDown() {
-  PlatformEnvironment::TearDown();
-  for (auto device_tuple : devices) {
-    if (urDeviceRelease(device_tuple.device)) {
-      error = "urDeviceRelease() failed";
-      return;
-    }
-  }
-}
-
 KernelsEnvironment *KernelsEnvironment::instance = nullptr;
 
 KernelsEnvironment::KernelsEnvironment(int argc, char **argv,

test/conformance/testing/include/uur/environment.h

@@ -48,7 +48,6 @@ struct DevicesEnvironment : PlatformEnvironment {
   virtual ~DevicesEnvironment() override = default;
 
   virtual void SetUp() override;
-  virtual void TearDown() override;
 
   inline const std::vector<DeviceTuple> &GetDevices() const { return devices; }
 

test/conformance/testing/include/uur/fixtures.h

@@ -90,9 +90,6 @@ struct urAllDevicesTest : urPlatformTest {
   }
 
   void TearDown() override {
-    for (auto &device : devices) {
-      EXPECT_SUCCESS(urDeviceRelease(device));
-    }
     UUR_RETURN_ON_FATAL_FAILURE(urPlatformTest::TearDown());
   }
 
@@ -160,9 +157,6 @@ struct urAllDevicesTestWithParam : urPlatformTestWithParam<T> {
   }
 
   void TearDown() override {
-    for (auto &device : devices) {
-      EXPECT_SUCCESS(urDeviceRelease(device));
-    }
     UUR_RETURN_ON_FATAL_FAILURE(urPlatformTestWithParam<T>::TearDown());
   }
 

test/conformance/testing/include/uur/known_failure.h

@@ -15,12 +15,47 @@
 #include <vector>
 
 namespace uur {
+namespace detail {
+struct AdapterInfo {
+  uint32_t version;
+  ur_adapter_backend_t backend;
+};
+
+inline AdapterInfo getAdapterInfo(ur_adapter_handle_t adapter) {
+  AdapterInfo info;
+  urAdapterGetInfo(adapter, UR_ADAPTER_INFO_VERSION, sizeof(info.version),
+                   &info.version, nullptr);
+  urAdapterGetInfo(adapter, UR_ADAPTER_INFO_BACKEND, sizeof(info.backend),
+                   &info.backend, nullptr);
+  return info;
+}
+} // namespace detail
+
 struct Matcher {
   Matcher(uint32_t adapterVersion, ur_adapter_backend_t backend,
           std::vector<std::string> deviceNames)
       : adapterVersion(adapterVersion), backend(backend),
         names(std::move(deviceNames)) {}
 
+  bool matches(const detail::AdapterInfo &adapterInfo,
+               const std::string &name) const {
+    if (backend != adapterInfo.backend) {
+      return false;
+    }
+    if (adapterVersion != adapterInfo.version) {
+      return false;
+    }
+    if (names.empty()) {
+      return true;
+    }
+    for (const auto &matcherName : names) {
+      if (name.find(matcherName) != std::string::npos) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   uint32_t adapterVersion;
   ur_adapter_backend_t backend;
   std::vector<std::string> names;
@@ -56,26 +91,10 @@ struct NativeCPU : Matcher {
       : Matcher(1, UR_ADAPTER_BACKEND_NATIVE_CPU, {il.begin(), il.end()}) {}
 };
 
-namespace detail {
-struct AdapterInfo {
-  uint32_t version;
-  ur_adapter_backend_t backend;
-};
-
-inline AdapterInfo getAdapterInfo(ur_adapter_handle_t adapter) {
-  AdapterInfo info;
-  urAdapterGetInfo(adapter, UR_ADAPTER_INFO_VERSION, sizeof(info.version),
-                   &info.version, nullptr);
-  urAdapterGetInfo(adapter, UR_ADAPTER_INFO_BACKEND, sizeof(info.backend),
-                   &info.backend, nullptr);
-  return info;
-}
-} // namespace detail
-
 inline bool isKnownFailureOn(ur_adapter_handle_t adapter,
                              const std::vector<Matcher> &matchers) {
+  auto adapterInfo = detail::getAdapterInfo(adapter);
   for (const auto &matcher : matchers) {
-    auto adapterInfo = detail::getAdapterInfo(adapter);
     if (matcher.adapterVersion == adapterInfo.version &&
         matcher.backend == adapterInfo.backend) {
       return true;
@@ -89,22 +108,13 @@ inline bool isKnownFailureOn(ur_platform_handle_t platform,
   ur_adapter_handle_t adapter = nullptr;
   urPlatformGetInfo(platform, UR_PLATFORM_INFO_ADAPTER,
                     sizeof(ur_adapter_handle_t), &adapter, nullptr);
+  auto adapterInfo = detail::getAdapterInfo(adapter);
+  std::string name;
+  uur::GetPlatformInfo<std::string>(platform, UR_PLATFORM_INFO_NAME, name);
   for (const auto &matcher : matchers) {
-    auto adapterInfo = detail::getAdapterInfo(adapter);
-    if (matcher.adapterVersion != adapterInfo.version &&
-        matcher.backend != adapterInfo.backend) {
-      continue;
-    }
-    if (matcher.names.empty()) {
+    if (matcher.matches(adapterInfo, name)) {
       return true;
     }
-    std::string name;
-    uur::GetPlatformInfo<std::string>(platform, UR_PLATFORM_INFO_NAME, name);
-    for (const auto &matcherName : matcher.names) {
-      if (name.find(matcherName) != std::string::npos) {
-        return true;
-      }
-    }
   }
   return false;
 }
@@ -119,24 +129,13 @@ isKnownFailureOn(const std::tuple<ur_platform_handle_t, Param> &param,
 
 inline bool isKnownFailureOn(const DeviceTuple &param,
                              const std::vector<Matcher> &matchers) {
+  auto adapterInfo = detail::getAdapterInfo(param.adapter);
+  std::string name;
+  uur::GetDeviceInfo<std::string>(param.device, UR_DEVICE_INFO_NAME, name);
   for (const auto &matcher : matchers) {
-    auto adapterInfo = detail::getAdapterInfo(param.adapter);
-    if (matcher.backend != adapterInfo.backend) {
-      continue;
-    }
-    if (matcher.adapterVersion != adapterInfo.version) {
-      continue;
-    }
-    if (matcher.names.empty()) {
+    if (matcher.matches(adapterInfo, name)) {
       return true;
     }
-    std::string name;
-    uur::GetDeviceInfo<std::string>(param.device, UR_DEVICE_INFO_NAME, name);
-    for (const auto &matcherName : matcher.names) {
-      if (name.find(matcherName) != std::string::npos) {
-        return true;
-      }
-    }
   }
   return false;
 }