Integrate IREE at iree-org/iree@e2dcbe1

Updates IREE usage to match iree-org/iree@e2dcbe1 and candidate-20231218.742, respectively. Thus further removes passing `--iree-llvmcpu-target-cpu` since the resolution of target features is not implement for Cortex-M.
iree-org · Dec 21, 2023 · 183a21e · 183a21e
1 parent 21ab807
commit 183a21e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 20 deletions.
diff --git a/build_tools/cmake/static_module.cmake b/build_tools/cmake/static_module.cmake
@@ -36,7 +36,6 @@ function(static_module)
 
   list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-triple=${IREE_LLVM_TARGET_TRIPLE}")
-  list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-cpu=${ARM_CPU}")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-float-abi=${IREE_LLVM_TARGET_FLOAT_ABI}")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")

diff --git a/iree-release-link.txt b/iree-release-link.txt
@@ -1 +1 @@
-https://github.com/openxla/iree/releases/download/candidate-20231004.665/iree-dist-20231004.665-linux-x86_64.tar.xz
+https://github.com/openxla/iree/releases/download/candidate-20231218.742/iree-dist-20231218.742-linux-x86_64.tar.xz
diff --git a/requirements-compiler.txt b/requirements-compiler.txt
@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
 # SPDX-License-Identifier: CC0-1.0
 -f https://openxla.github.io/iree/pip-release-links.html
-iree-compiler==20231004.665
+iree-compiler==20231218.742
diff --git a/requirements-tools.txt b/requirements-tools.txt
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2022 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
 # SPDX-License-Identifier: CC0-1.0
 -f https://openxla.github.io/iree/pip-release-links.html
-iree-tools-tf==20231004.665
-iree-tools-tflite==20231004.665
+iree-tools-tf==20231218.742
+iree-tools-tflite==20231218.742
diff --git a/samples/simple_embedding/CMakeLists.txt b/samples/simple_embedding/CMakeLists.txt
@@ -99,7 +99,6 @@ if(IREE_HAL_EXECUTABLE_LOADER_EMBEDDED_ELF)
   list(APPEND _COMPILE_ARGS "--output-format=vm-bytecode")
   list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-triple=${IREE_LLVM_TARGET_TRIPLE}")
-  list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-cpu=${ARM_CPU}")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-float-abi=${IREE_LLVM_TARGET_FLOAT_ABI}")
   list(APPEND _COMPILE_ARGS "--iree-llvmcpu-debug-symbols=false")
   list(APPEND _COMPILE_ARGS "--iree-vm-bytecode-module-strip-source-map=true")

diff --git a/samples/simple_embedding/simple_embedding_float.c b/samples/simple_embedding/simple_embedding_float.c
@@ -40,9 +40,9 @@ iree_status_t Run() {
   IREE_RETURN_IF_ERROR(create_sample_device(iree_allocator_system(), &device),
                        "create device");
   iree_vm_module_t* hal_module = NULL;
-  IREE_RETURN_IF_ERROR(
-      iree_hal_module_create(instance, device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
-                             iree_allocator_system(), &hal_module));
+  IREE_RETURN_IF_ERROR(iree_hal_module_create(
+      instance, /*device_count=*/1, &device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
+      iree_allocator_system(), &hal_module));
 
   // Load bytecode module from the embedded data.
   const iree_const_byte_span_t module_data = load_bytecode_module_data();

diff --git a/samples/simple_embedding/simple_embedding_int.c b/samples/simple_embedding/simple_embedding_int.c
@@ -40,9 +40,9 @@ iree_status_t Run() {
   IREE_RETURN_IF_ERROR(create_sample_device(iree_allocator_system(), &device),
                        "create device");
   iree_vm_module_t* hal_module = NULL;
-  IREE_RETURN_IF_ERROR(
-      iree_hal_module_create(instance, device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
-                             iree_allocator_system(), &hal_module));
+  IREE_RETURN_IF_ERROR(iree_hal_module_create(
+      instance, /*device_count=*/1, &device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
+      iree_allocator_system(), &hal_module));
 
   // Load bytecode module from the embedded data.
   const iree_const_byte_span_t module_data = load_bytecode_module_data();

diff --git a/samples/simple_vec_mul/simple_mul_int.c b/samples/simple_vec_mul/simple_mul_int.c
@@ -81,9 +81,9 @@ iree_status_t Run() {
 #else
   // Create hal_module
   iree_vm_module_t* hal_module = NULL;
-  IREE_RETURN_IF_ERROR(
-      iree_hal_module_create(instance, device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
-                             iree_allocator_system(), &hal_module));
+  IREE_RETURN_IF_ERROR(iree_hal_module_create(
+      instance, /*device_count=*/1, &device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
+      iree_allocator_system(), &hal_module));
 
   iree_vm_module_t* modules[] = {hal_module, module};
 #endif

diff --git a/samples/static_library/CMakeLists.txt b/samples/static_library/CMakeLists.txt
@@ -20,7 +20,6 @@ set(_COMPILE_ARGS)
 list(APPEND _COMPILE_ARGS "--output-format=vm-bytecode")
 list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-triple=${IREE_LLVM_TARGET_TRIPLE}")
-list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-cpu=${ARM_CPU}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-float-abi=${IREE_LLVM_TARGET_FLOAT_ABI}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")
@@ -97,7 +96,6 @@ set(_COMPILE_ARGS)
 list(APPEND _COMPILE_ARGS "--output-format=vm-c")
 list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-triple=${IREE_LLVM_TARGET_TRIPLE}")
-list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-cpu=${ARM_CPU}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-float-abi=${IREE_LLVM_TARGET_FLOAT_ABI}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")

diff --git a/samples/vision_inference/CMakeLists.txt b/samples/vision_inference/CMakeLists.txt
@@ -40,7 +40,6 @@ list(APPEND _COMPILE_ARGS "--iree-input-type=stablehlo")
 list(APPEND _COMPILE_ARGS "--output-format=vm-bytecode")
 list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-triple=${IREE_LLVM_TARGET_TRIPLE}")
-list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-cpu=${ARM_CPU}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-float-abi=${IREE_LLVM_TARGET_FLOAT_ABI}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")
@@ -121,7 +120,6 @@ list(APPEND _COMPILE_ARGS "--iree-input-type=stablehlo")
 list(APPEND _COMPILE_ARGS "--output-format=vm-c")
 list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-triple=${IREE_LLVM_TARGET_TRIPLE}")
-list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-cpu=${ARM_CPU}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-target-float-abi=${IREE_LLVM_TARGET_FLOAT_ABI}")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
 list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")

diff --git a/third_party/iree b/third_party/iree
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://github.com/openxla/iree/releases/download/candidate-20231004.665/iree-dist-20231004.665-linux-x86_64.tar.xz
		https://github.com/openxla/iree/releases/download/candidate-20231218.742/iree-dist-20231218.742-linux-x86_64.tar.xz