Revert "Arm backend: Add bfloat16 support to VGF backend. (#20299)"

This reverts commit ae64df0.

Author: rascani

backends/arm/runtime/VGFSetup.cpp

@@ -66,7 +66,6 @@ enum class FormatScalarKind {
   Uint,
   Sint,
   Float,
-  BFloat,
 };
 
 struct FormatInfo {
@@ -158,7 +157,6 @@ static uint32_t get_format_component_count(VkFormat format) {
     case VK_FORMAT_R16_UINT:
     case VK_FORMAT_R16_SINT:
     case VK_FORMAT_R16_SFLOAT:
-    case VK_FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM:
     case VK_FORMAT_R32_UINT:
     case VK_FORMAT_R32_SINT:
     case VK_FORMAT_R32_SFLOAT:
@@ -211,9 +209,6 @@ static bool get_format_info(VkFormat format, FormatInfo* info) {
     case VK_FORMAT_R16_SFLOAT:
       *info = FormatInfo{1, 2, FormatScalarKind::Float};
       return true;
-    case VK_FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM:
-      *info = FormatInfo{1, 2, FormatScalarKind::BFloat};
-      return true;
     case VK_FORMAT_R32_UINT:
       *info = FormatInfo{1, 4, FormatScalarKind::Uint};
       return true;
@@ -3701,7 +3696,6 @@ static uint32_t get_format_size(VkFormat format) {
     case VK_FORMAT_R16_UINT:
     case VK_FORMAT_R16_SINT:
     case VK_FORMAT_R16_SFLOAT:
-    case VK_FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM:
     case VK_FORMAT_R8G8_UINT:
     case VK_FORMAT_R8G8_SINT:
       return 2;

backends/arm/scripts/vulkan_utils.sh

@@ -26,21 +26,21 @@ vulkan_sdk_arch="${ARCH}"
 # macOS and Linux x86_64 use the official LunarG SDK tarballs. Linux ARM64
 # uses a separately repackaged mirror of the same SDK version.
 if [[ "${os_name}" == "Darwin" ]]; then
-    vulkan_sdk_version="1.4.350.0"
+    vulkan_sdk_version="1.4.341.1"
     vulkan_sdk_arch="macOS"
     vulkan_sdk_url="https://sdk.lunarg.com/sdk/download/${vulkan_sdk_version}/mac/vulkansdk-macos-${vulkan_sdk_version}.zip"
-    vulkan_sdk_sha256="7acc181b8fd9b4781bf51ed086222ec95d22004b85b3d0a6683a7e48ca5a1679"
+    vulkan_sdk_sha256="632cbe96c8ed6ed00c6ce25e3a7738c466134f76586e1c51f1419410d7f9042e"
 elif [[ "${os_name}" == "Linux" ]] && [[ "${ARCH}" == "x86_64" ]]; then
-    vulkan_sdk_version="1.4.350.0"
+    vulkan_sdk_version="1.4.341.1"
     vulkan_sdk_url="https://sdk.lunarg.com/sdk/download/${vulkan_sdk_version}/linux/vulkansdk-linux-x86_64-${vulkan_sdk_version}.tar.xz"
-    vulkan_sdk_sha256="b65f068ab36263559da49d7cacd7e7b9df23824ca8b68ccc522a2b06f5725df2"
+    vulkan_sdk_sha256="3bf0f762afb6c79bc6a9d9fb5998745ccff928800a29619b501ed9de7fd9789b"
 elif [[ "${os_name}" == "Linux" ]] && ([[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]]); then
-    vulkan_sdk_version="1.4.350.0"
+    vulkan_sdk_version="1.4.341.1"
     if [[ "${vulkan_sdk_arch}" == "arm64" ]]; then
         vulkan_sdk_arch="aarch64"
     fi
     vulkan_sdk_url="https://github.com/jakoch/vulkan-sdk-arm/releases/download/${vulkan_sdk_version}/vulkansdk-ubuntu-22.04-arm-${vulkan_sdk_version}.tar.xz"
-    vulkan_sdk_sha256="9e403d444219bb7c17e9231b580d704453e2afa30a1c2fdd568d1776dc68790b"
+    vulkan_sdk_sha256="345312aee2c835e128b30653278593f899a659a7ba287c571cafb22acb708b8f"
 else
     log_step "vulkan" "Error: only macOS and Linux are supported (detected ${os_name}); architecture must be x86-64 or aarch64/arm64"
     exit 1

backends/arm/test/ops/test_matmul.py

@@ -455,7 +455,7 @@ def test_matmul_u85_INT(test_case: test_case_t):
     pipeline.run()
 
 
-@common.parametrize("test_case", test_suite | test_suite_fp16 | test_suite_bf16)
+@common.parametrize("test_case", test_suite | test_suite_fp16)
 @common.SkipIfNoModelConverter
 def test_matmul_vgf_no_quant(test_case: test_case_t):
     test_data = test_case()

backends/arm/test/runner_utils.py

@@ -243,7 +243,8 @@ def is_concrete_shape(shape_like) -> bool:
         return all(isinstance(dim, numbers.Integral) for dim in shape_like)
 
     def to_torch_tensor() -> torch.Tensor:
-        if output_tensor.dtype == torch.bfloat16 or array.dtype.type is np.void:
+        if array.dtype.type is np.void:
+            # If dtype is void, "cheat" and use the output_tensor dtype.
             return torch.frombuffer(array, dtype=output_tensor.dtype)
         return torch.from_numpy(array)
 

backends/arm/test/tester/test_pipeline.py

@@ -1258,15 +1258,13 @@ def __init__(
     ):
         if tosa_spec is None:
             if tosa_version is None:
-                tosa_version = str(VgfCompileSpec().tosa_spec)
-            if tosa_extensions is None:
-                if "FP" in tosa_version:
-                    tosa_extensions = ["bf16"]
-                else:
+                tosa_spec = VgfCompileSpec().tosa_spec
+            else:
+                if tosa_extensions is None:
                     tosa_extensions = []
-            tosa_spec = TosaSpecification.create_from_string(
-                tosa_version + "".join([f"+{ext}" for ext in tosa_extensions])
-            )
+                tosa_spec = TosaSpecification.create_from_string(
+                    tosa_version + "".join([f"+{ext}" for ext in tosa_extensions])
+                )
         elif isinstance(tosa_spec, str):
             tosa_spec = TosaSpecification.create_from_string(tosa_spec)
         compile_spec = common.get_vgf_compile_spec(