a few more fixes

Author: bashbaug

samples/20_matrixexperiments-bf16/main.cpp

@@ -10,6 +10,7 @@
 
 #include <algorithm>
 #include <chrono>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <random>
@@ -68,18 +69,23 @@ std::string makeTestName(
 
 static size_t findMinSubGroupSize(cl::Device& device)
 {
-    auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
-    auto it = std::min_element(std::begin(s), std::end(s));
-    if (it != std::end(s)) {
-        return *it;
+    if (checkDeviceForExtension(device, CL_INTEL_REQUIRED_SUBGROUP_SIZE_EXTENSION_NAME)) {
+        auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
+        auto it = std::min_element(std::begin(s), std::end(s));
+        if (it != std::end(s)) {
+            return *it;
+        }
     }
     return 0;
 }
 
 static bool supportsSubgroupSize(cl::Device& device, size_t subgroupSize)
 {
-    auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
-    return std::find(std::begin(s), std::end(s), subgroupSize) != std::end(s);
+    if (checkDeviceForExtension(device, CL_INTEL_REQUIRED_SUBGROUP_SIZE_EXTENSION_NAME)) {
+        auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
+        return std::find(std::begin(s), std::end(s), subgroupSize) != std::end(s);
+    }
+    return false;
 }
 
 static void setRoundRobin(cl::Kernel& kernel)

samples/20_matrixexperiments-bf16/matrix_helpers_bf16.cl

@@ -61,8 +61,8 @@ float8 activation(float8 f)
 #ifndef __has_builtin
 #define __has_builtin(x) 0
 #endif
-#if __has_builtin(__builtin_expect) == 0
-#define __builtin_expect(x)
+#if __has_builtin(__builtin_assume) == 0
+#define __builtin_assume(x)
 #endif
 
 #if defined(cl_intel_subgroups) && defined(cl_intel_subgroups_short)

samples/20_matrixexperiments-i8/main.cpp

@@ -10,7 +10,7 @@
 
 #include <algorithm>
 #include <chrono>
-#include <cstdint>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <random>
@@ -68,18 +68,23 @@ std::string makeTestName(
 
 static size_t findMinSubGroupSize(cl::Device& device)
 {
-    auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
-    auto it = std::min_element(std::begin(s), std::end(s));
-    if (it != std::end(s)) {
-        return *it;
+    if (checkDeviceForExtension(device, CL_INTEL_REQUIRED_SUBGROUP_SIZE_EXTENSION_NAME)) {
+        auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
+        auto it = std::min_element(std::begin(s), std::end(s));
+        if (it != std::end(s)) {
+            return *it;
+        }
     }
     return 0;
 }
 
 static bool supportsSubgroupSize(cl::Device& device, size_t subgroupSize)
 {
-    auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
-    return std::find(std::begin(s), std::end(s), subgroupSize) != std::end(s);
+    if (checkDeviceForExtension(device, CL_INTEL_REQUIRED_SUBGROUP_SIZE_EXTENSION_NAME)) {
+        auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
+        return std::find(std::begin(s), std::end(s), subgroupSize) != std::end(s);
+    }
+    return false;
 }
 
 static void setRoundRobin(cl::Kernel& kernel)

samples/20_matrixexperiments-i8/matrix_helpers_i8.cl

@@ -52,8 +52,8 @@ int8 activation(int8 i)
 #ifndef __has_builtin
 #define __has_builtin(x) 0
 #endif
-#if __has_builtin(__builtin_expect) == 0
-#define __builtin_expect(x)
+#if __has_builtin(__builtin_assume) == 0
+#define __builtin_assume(x)
 #endif
 
 #if defined(__opencl_c_integer_dot_product_input_4x8bit_packed)

samples/20_matrixexperiments-tf32/main.cpp

@@ -10,8 +10,7 @@
 
 #include <algorithm>
 #include <chrono>
-#include <cmath>
-#include <limits>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <random>
@@ -69,10 +68,12 @@ std::string makeTestName(
 
 static size_t findMinSubGroupSize(cl::Device& device)
 {
-    auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
-    auto it = std::min_element(std::begin(s), std::end(s));
-    if (it != std::end(s)) {
-        return *it;
+    if (checkDeviceForExtension(device, CL_INTEL_REQUIRED_SUBGROUP_SIZE_EXTENSION_NAME)) {
+        auto s = device.getInfo<CL_DEVICE_SUB_GROUP_SIZES_INTEL>();
+        auto it = std::min_element(std::begin(s), std::end(s));
+        if (it != std::end(s)) {
+            return *it;
+        }
     }
     return 0;
 }

samples/20_matrixexperiments-tf32/matrix_helpers_tf32.cl

@@ -52,8 +52,8 @@ float8 activation(float8 f)
 #ifndef __has_builtin
 #define __has_builtin(x) 0
 #endif
-#if __has_builtin(__builtin_expect) == 0
-#define __builtin_expect(x)
+#if __has_builtin(__builtin_assume) == 0
+#define __builtin_assume(x)
 #endif
 
 #if defined(cl_intel_subgroups)