Integrate IREE at iree-org/iree@c793f9 (#351)

Updates IREE usage to match iree-org/iree@c793f9 and iree-3.2.0rc20250110, respectively.
iree-org · Jan 10, 2025 · b3bb428 · b3bb428
1 parent 96b7ca5
commit b3bb428
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/build_tools/cmake/arm-none-eabi-gcc.cmake b/build_tools/cmake/arm-none-eabi-gcc.cmake
@@ -92,7 +92,7 @@ elseif(ARM_CPU STREQUAL "cortex-m33")
   set(ARM_COMPILER_FLAGS "${ARM_COMPILER_FLAGS} -mthumb -march=armv8-m.main -mfloat-abi=hard -mfpu=fpv5-sp-d16")
 endif()
 
-set(ARM_COMPILER_FLAGS "${ARM_COMPILER_FLAGS} -DIREE_TIME_NOW_FN=\"\{ return 0; \}\" -DIREE_WAIT_UNTIL_FN=wait_until")
+set(ARM_COMPILER_FLAGS "${ARM_COMPILER_FLAGS} -DIREE_FILE_IO_ENABLE=0 -DIREE_TIME_NOW_FN=\"\{ return 0; \}\" -DIREE_WAIT_UNTIL_FN=wait_until")
 set(ARM_COMPILER_FLAGS "${ARM_COMPILER_FLAGS} -Wl,--gc-sections -ffunction-sections -fdata-sections")
 
 if(ARM_CPU STREQUAL "cortex-m55")

diff --git a/build_tools/install_iree_host_tools.sh b/build_tools/install_iree_host_tools.sh
@@ -42,7 +42,7 @@ else
   IREE_VERSION="`sed -n 4p ${PATH_TO_REPO}/requirements-compiler.txt | sed 's/.*=//'`"
 fi
 
-echo "Installing IREE host tools candidate-${IREE_VERSION}"
+echo "Installing IREE host tools version ${IREE_VERSION}"
 
 
 # Create the IREE_HOST_BIN_DIR directory

diff --git a/iree-release-link.txt b/iree-release-link.txt
@@ -1 +1 @@
-https://github.com/iree-org/iree/releases/download/candidate-20240917.1019/iree-dist-20240917.1019-linux-x86_64.tar.xz
+https://github.com/iree-org/iree/releases/download/iree-3.2.0rc20250110/iree-dist-3.2.0rc20250110-linux-x86_64.tar.xz
diff --git a/requirements-compiler.txt b/requirements-compiler.txt
@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023 The IREE bare-metal Arm Authors
 # SPDX-License-Identifier: CC0-1.0
 -f https://iree.dev/pip-release-links.html
-iree-compiler==20240917.1019
+iree-base-compiler==3.2.0rc20250110
diff --git a/requirements-tools.txt b/requirements-tools.txt
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2022 The IREE bare-metal Arm Authors
 # SPDX-License-Identifier: CC0-1.0
 -f https://iree.dev/pip-release-links.html
-iree-tools-tf==20240917.1019
-iree-tools-tflite==20240917.1019
+iree-tools-tf==20250110.1136
+iree-tools-tflite==20250110.1136
diff --git a/samples/simple_embedding/simple_embedding_float.c b/samples/simple_embedding/simple_embedding_float.c
@@ -42,7 +42,8 @@ iree_status_t Run() {
   iree_vm_module_t* hal_module = NULL;
   IREE_RETURN_IF_ERROR(iree_hal_module_create(
       instance, /*device_count=*/1, &device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
-      iree_allocator_system(), &hal_module));
+      iree_hal_module_debug_sink_stdio(stderr), 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
@@ -42,7 +42,8 @@ iree_status_t Run() {
   iree_vm_module_t* hal_module = NULL;
   IREE_RETURN_IF_ERROR(iree_hal_module_create(
       instance, /*device_count=*/1, &device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
-      iree_allocator_system(), &hal_module));
+      iree_hal_module_debug_sink_stdio(stderr), 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
@@ -64,6 +64,7 @@ iree_status_t Run() {
   iree_vm_module_t* hal_inline_module = NULL;
   IREE_RETURN_IF_ERROR(iree_hal_inline_module_create(
       instance, IREE_HAL_INLINE_MODULE_FLAG_NONE,
+      iree_hal_module_debug_sink_stdio(stderr),
       iree_hal_device_allocator(device), iree_allocator_system(),
       &hal_inline_module));
 #endif
@@ -83,7 +84,8 @@ iree_status_t Run() {
   iree_vm_module_t* hal_module = NULL;
   IREE_RETURN_IF_ERROR(iree_hal_module_create(
       instance, /*device_count=*/1, &device, IREE_HAL_MODULE_FLAG_SYNCHRONOUS,
-      iree_allocator_system(), &hal_module));
+      iree_hal_module_debug_sink_stdio(stderr), iree_allocator_system(),
+      &hal_module));
 
   iree_vm_module_t* modules[] = {hal_module, module};
 #endif

diff --git a/samples/vision_inference/static_library_mnist.c b/samples/vision_inference/static_library_mnist.c
@@ -23,8 +23,7 @@
 // Converted image embedded here:
 #include "model_input.h"
 
-extern const iree_hal_executable_library_header_t**
-mnist_linked_llvm_cpu_library_query(
+extern const iree_hal_executable_library_header_t** mnist_linked_library_query(
     iree_hal_executable_library_version_t max_version,
     const iree_hal_executable_environment_v0_t* environment);
 // A function to create the bytecode or C module.
@@ -44,7 +43,7 @@ iree_status_t create_device_with_static_loader(iree_allocator_t host_allocator,
 
   // Register the statically linked executable library.
   const iree_hal_executable_library_query_fn_t libraries[] = {
-      mnist_linked_llvm_cpu_library_query,
+      mnist_linked_library_query,
   };
   iree_hal_executable_loader_t* library_loader = NULL;
   iree_status_t status = iree_hal_static_library_loader_create(

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/iree-org/iree/releases/download/candidate-20240917.1019/iree-dist-20240917.1019-linux-x86_64.tar.xz
		https://github.com/iree-org/iree/releases/download/iree-3.2.0rc20250110/iree-dist-3.2.0rc20250110-linux-x86_64.tar.xz