commit 6e64b6e0978dcef6bfa31269ace58fbcd40ba16e
author Ben Vanik <ben.vanik@gmail.com> Tue Jun 07 09:14:53 2022 -0700
committer Ben Vanik <ben.vanik@gmail.com> Tue Jun 07 11:51:52 2022 -0700
tree d6bfa276f377d8637c033c6ccfb70b85e88034d8
parent 584681f4a152934d98a90bb44a25f3e60cfb413f

Replacing use of dylib/vmvx(-sync) with local-task/local-sync drivers.

samples/simple_embedding/BUILD

diff --git a/samples/simple_embedding/BUILD b/samples/simple_embedding/BUILD
index b58e2c2..a1b2dcd 100644
--- a/samples/simple_embedding/BUILD
+++ b/samples/simple_embedding/BUILD
@@ -16,7 +16,7 @@
 
 iree_cmake_extra_content(
     content = """
-if((IREE_HAL_DRIVER_VMVX OR IREE_HAL_DRIVER_VMVX_SYNC) AND
+if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE AND
    (IREE_TARGET_BACKEND_VMVX OR DEFINED IREE_HOST_BINARY_ROOT))
 """,
     inline = True,
@@ -66,7 +66,7 @@
 
 iree_cmake_extra_content(
     content = """
-if((IREE_HAL_DRIVER_DYLIB OR IREE_HAL_DRIVER_DYLIB_SYNC) AND
+if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF AND
    (IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR DEFINED IREE_HOST_BINARY_ROOT))
 """,
     inline = True,
@@ -184,7 +184,7 @@
 
 iree_cmake_extra_content(
     content = """
-if(IREE_HAL_DRIVER_DYLIB)
+if(IREE_HAL_DRIVER_LOCAL_TASK AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF)
 """,
     inline = True,
 )

samples/simple_embedding/CMakeLists.txt

diff --git a/samples/simple_embedding/CMakeLists.txt b/samples/simple_embedding/CMakeLists.txt
index 56899e0..fe501a4 100644
--- a/samples/simple_embedding/CMakeLists.txt
+++ b/samples/simple_embedding/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 iree_add_all_subdirs()
 
-if((IREE_HAL_DRIVER_VMVX OR IREE_HAL_DRIVER_VMVX_SYNC) AND
+if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE AND
    (IREE_TARGET_BACKEND_VMVX OR DEFINED IREE_HOST_BINARY_ROOT))
 
 iree_cc_binary(
@@ -54,7 +54,7 @@
 
 endif()
 
-if((IREE_HAL_DRIVER_DYLIB OR IREE_HAL_DRIVER_DYLIB_SYNC) AND
+if(IREE_HAL_DRIVER_LOCAL_SYNC AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF AND
    (IREE_TARGET_BACKEND_DYLIB_LLVM_AOT OR DEFINED IREE_HOST_BINARY_ROOT))
 
 iree_cc_binary(
@@ -183,7 +183,7 @@
     ::simple_embedding_embedded_sync
 )
 
-if(IREE_HAL_DRIVER_DYLIB)
+if(IREE_HAL_DRIVER_LOCAL_TASK AND IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF)
 
 iree_cc_binary(
   NAME

samples/simple_embedding/device_vmvx_sync.c

diff --git a/samples/simple_embedding/device_vmvx_sync.c b/samples/simple_embedding/device_vmvx_sync.c
index d83a500..5aef183 100644
--- a/samples/simple_embedding/device_vmvx_sync.c
+++ b/samples/simple_embedding/device_vmvx_sync.c
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-// A example of setting up the vmvx-sync driver.
+// A example of setting up the local-sync driver using VMVX for execution.
 
 #include <stddef.h>