Integrate IREE at iree-org/iree@1dbd0ba (#260)

Updates IREE usage to match iree-org/iree@1dbd0ba and candidate-20230623.561, respectively.
iree-org · Jul 18, 2023 · f65ed31 · f65ed31
1 parent c2947c9
commit f65ed31
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/iree-release-link.txt b/iree-release-link.txt
@@ -1 +1 @@
-https://github.com/openxla/iree/releases/download/candidate-20230420.495/iree-dist-20230420.495-linux-x86_64.tar.xz
+https://github.com/openxla/iree/releases/download/candidate-20230623.561/iree-dist-20230623.561-linux-x86_64.tar.xz
diff --git a/requirements-compiler.txt b/requirements-compiler.txt
@@ -1,2 +1,2 @@
 -f https://openxla.github.io/iree/pip-release-links.html
-iree-compiler==20230420.495
+iree-compiler==20230623.561
diff --git a/requirements-tools.txt b/requirements-tools.txt
@@ -1,3 +1,3 @@
 -f https://openxla.github.io/iree/pip-release-links.html
-iree-tools-tf==20230420.495
-iree-tools-tflite==20230420.495
+iree-tools-tf==20230623.561
+iree-tools-tflite==20230623.561
diff --git a/samples/simple_vec_mul/CMakeLists.txt b/samples/simple_vec_mul/CMakeLists.txt
@@ -16,7 +16,7 @@ if(IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE)
     C_IDENTIFIER
       "simple_mul_int_bytecode_module_vmvx"
     FLAGS
-      "--iree-input-type=mhlo"
+      "--iree-input-type=stablehlo"
   )
 
   add_executable(simple_vec_mul_int_bytecode_vmvx "")
@@ -70,7 +70,7 @@ if(IREE_HAL_EXECUTABLE_LOADER_VMVX_MODULE)
     C_IDENTIFIER
       "simple_mul_int_bytecode_module_vmvx"
     FLAGS
-      "--iree-input-type=mhlo"
+      "--iree-input-type=stablehlo"
     INLINE_HAL
   )
 
@@ -137,7 +137,7 @@ static_module(
   C_IDENTIFIER
     "simple_mul_int"
   FLAGS
-    "--iree-input-type=mhlo"
+    "--iree-input-type=stablehlo"
 )
 
 target_include_directories(simple_vec_mul_int_bytecode_static
@@ -181,7 +181,7 @@ static_module(
   C_IDENTIFIER
     "simple_mul_int"
   FLAGS
-    "--iree-input-type=mhlo"
+    "--iree-input-type=stablehlo"
   INLINE_HAL
 )
 
@@ -231,7 +231,7 @@ static_module(
   SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/simple_mul_int.mlir"
   FLAGS
-    "--iree-input-type=mhlo"
+    "--iree-input-type=stablehlo"
   EMITC
 )
 
@@ -273,7 +273,7 @@ static_module(
   SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/simple_mul_int.mlir"
   FLAGS
-    "--iree-input-type=mhlo"
+    "--iree-input-type=stablehlo"
   EMITC
   INLINE_HAL
 )

diff --git a/samples/simple_vec_mul/simple_mul_int.mlir b/samples/simple_vec_mul/simple_mul_int.mlir
@@ -1,5 +1,5 @@
 func.func @simple_mul(%arg0: tensor<1024xi32>, %arg1: tensor<1024xi32>) -> tensor<1024xi32>
 {
-  %0 = "mhlo.multiply"(%arg0, %arg1) : (tensor<1024xi32>, tensor<1024xi32>) -> tensor<1024xi32>
+  %0 = "stablehlo.multiply"(%arg0, %arg1) : (tensor<1024xi32>, tensor<1024xi32>) -> tensor<1024xi32>
   return %0 : tensor<1024xi32>
 }
diff --git a/samples/vision_inference/CMakeLists.txt b/samples/vision_inference/CMakeLists.txt
@@ -34,7 +34,7 @@ target_sources(mnist_static_library
 )
 
 set(_COMPILE_ARGS)
-list(APPEND _COMPILE_ARGS "--iree-input-type=mhlo")
+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}")
@@ -115,7 +115,7 @@ add_ihex(mnist_static_library)
 add_executable(mnist_static_library_c "")
 
 set(_COMPILE_ARGS)
-list(APPEND _COMPILE_ARGS "--iree-input-type=mhlo")
+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}")

diff --git a/third_party/iree b/third_party/iree