SWDEV-465215 - fixes for hipFuncGetAttribute tests

Fixes SWDEV-465215, SWDEV-465213, SWDEV-465212

Change-Id: I08b114bf647366abcf900d6b2a17f77ca608fc46

catch/unit/executionControl/hipFuncGetAttributes.cc

@@ -34,13 +34,9 @@ TEST_CASE("Unit_hipFuncGetAttributes_Positive_Basic") {
   HIP_CHECK(hipFuncGetAttributes(&attr, reinterpret_cast<void*>(attribute_test_kernel)));
 
   SECTION("binaryVersion") {
-#if HT_NVIDIA
     const auto major = GetDeviceAttribute(hipDeviceAttributeComputeCapabilityMajor, 0);
     const auto minor = GetDeviceAttribute(hipDeviceAttributeComputeCapabilityMinor, 0);
     REQUIRE(attr.binaryVersion == major * 10 + minor);
-#elif HT_AMD
-    REQUIRE(attr.binaryVersion > 0);
-#endif
   }
 
   SECTION("cacheModeCA") { REQUIRE((attr.cacheModeCA == 0 || attr.cacheModeCA == 1)); }

catch/unit/executionControl/hipFuncSetAttribute.cc

@@ -181,7 +181,7 @@ TEST_CASE("Unit_hipFuncSetAttribute_Negative_Parameters") {
     // The sum of this value and the function attribute sharedSizeBytes cannot exceed the device
     // attribute cudaDevAttrMaxSharedMemoryPerBlockOptin
     int max_shared;
-    HIP_CHECK(hipDeviceGetAttribute(&max_shared, hipDeviceAttributeMaxSharedMemoryPerBlock, 0));
+    HIP_CHECK(hipDeviceGetAttribute(&max_shared, hipDeviceAttributeSharedMemPerBlockOptin, 0));
 
     hipFuncAttributes attributes;
     HIP_CHECK(hipFuncGetAttributes(&attributes, reinterpret_cast<void*>(kernel)));