diff --git a/backends/arm/runtime/VGFBackend.cpp b/backends/arm/runtime/VGFBackend.cpp index 85cf89e14fa..b83d3137b55 100644 --- a/backends/arm/runtime/VGFBackend.cpp +++ b/backends/arm/runtime/VGFBackend.cpp @@ -27,8 +27,8 @@ using executorch::runtime::MemoryAllocator; using executorch::runtime::Result; using executorch::runtime::Span; -// We use the platform and runtime environment provided by the Vulkan delegate -#include +// Volk meta-loader provides Vulkan function pointers (ARM tensor extensions, etc.) +#include // Dependencies for processing VGF files into Vulkan calls #include diff --git a/backends/arm/runtime/VGFSetup.h b/backends/arm/runtime/VGFSetup.h index 8e07b36e303..094569c41a0 100644 --- a/backends/arm/runtime/VGFSetup.h +++ b/backends/arm/runtime/VGFSetup.h @@ -15,8 +15,8 @@ using namespace std; using executorch::runtime::ArrayRef; using executorch::runtime::CompileSpec; -// We use the platform and runtime environment provided by the Vulkan delegate -#include +// Volk meta-loader provides Vulkan function pointers (ARM tensor extensions, etc.) +#include namespace executorch { namespace backends { diff --git a/backends/arm/runtime/targets.bzl b/backends/arm/runtime/targets.bzl index 29455f0e657..babc4e9b565 100644 --- a/backends/arm/runtime/targets.bzl +++ b/backends/arm/runtime/targets.bzl @@ -41,7 +41,7 @@ def define_common_targets(): # function-pointer variables live in the same linkage unit. # Linking from a separate static library causes the linker to # drop the symbols when building a shared library. - "fbsource//third-party/vulkan-headers-1.4.343/v1.4.343/src:volk_arm_src", + "fbsource//third-party/volk:volk_src", ], exported_headers = ["VGFSetup.h"], # @lint-ignore BUCKLINT: Avoid `link_whole=True` (https://fburl.com/avoid-link-whole) @@ -52,15 +52,13 @@ def define_common_targets(): "-Wno-header-hygiene", "-Wno-unused-variable", "-Wno-missing-field-initializers", - "-DUSE_VULKAN_WRAPPER", - "-DUSE_VULKAN_VOLK", ], visibility = ["PUBLIC"], deps = [ "//executorch/runtime/backend:interface", "//executorch/runtime/core:core", "fbsource//third-party/arm-vgf-library/v0.9.0/src:vgf", - "fbsource//third-party/vulkan-headers-1.4.343/v1.4.343/src:volk_arm", - "fbsource//third-party/vulkan-headers-1.4.343/v1.4.343/src:vulkan-headers", + "fbsource//third-party/khronos:vulkan-headers", + "fbsource//third-party/volk:volk-header", ], )