commit ce80645d185c7e038c28fb0fb14c0930f43a9928
author Lun Dong <lundong@google.com> Thu Sep 29 09:38:01 2022 -0700
committer Lun Dong <lundong@google.com> Thu Sep 29 09:54:22 2022 -0700
tree c1ce49fa979e87a2ff5b4abb95969ba39fb41e83
parent 1a82e44fbe6774f9e199cd97f094f7c0eb45c386

Add compiler flag to accommodate IREE upstream change

This fixes the breakage on IREE release 280.

Also use this opportunity to clean up "-" and "--" inconsistency.

Fix: 249528563
Change-Id: Icc57fd6d77104a953b91bcd45e011ab01e6f5409

cmake/springbok_static_module.cmake

diff --git a/cmake/springbok_static_module.cmake b/cmake/springbok_static_module.cmake
index b923ad4..e30e54a 100644
--- a/cmake/springbok_static_module.cmake
+++ b/cmake/springbok_static_module.cmake
@@ -78,14 +78,14 @@
   # Set common iree-compile flags
   set(_COMPILER_ARGS ${_RULE_FLAGS})
   list(APPEND _COMPILER_ARGS "--iree-hal-target-backends=llvm-cpu")
-  list(APPEND _COMPILER_ARGS "-iree-llvm-debug-symbols=false")
-  list(APPEND _COMPILER_ARGS "-iree-vm-bytecode-module-strip-source-map=true")
-  list(APPEND _COMPILER_ARGS "-iree-vm-emit-polyglot-zip=false")
-  list(APPEND _COMPILER_ARGS "-iree-llvm-target-triple=riscv32-pc-linux-elf")
-  list(APPEND _COMPILER_ARGS "-iree-llvm-target-cpu=generic-rv32")
-  list(APPEND _COMPILER_ARGS "-iree-llvm-target-cpu-features=${_CPU_FEATURES}")
-  list(APPEND _COMPILER_ARGS "-iree-llvm-target-abi=ilp32")
-  list(APPEND _COMPILER_ARGS "-iree-llvm-link-embedded=false")
+  list(APPEND _COMPILER_ARGS "--iree-llvm-debug-symbols=false")
+  list(APPEND _COMPILER_ARGS "--iree-vm-bytecode-module-strip-source-map=true")
+  list(APPEND _COMPILER_ARGS "--iree-vm-emit-polyglot-zip=false")
+  list(APPEND _COMPILER_ARGS "--iree-llvm-target-triple=riscv32-pc-linux-elf")
+  list(APPEND _COMPILER_ARGS "--iree-llvm-target-cpu=generic-rv32")
+  list(APPEND _COMPILER_ARGS "--iree-llvm-target-cpu-features=${_CPU_FEATURES}")
+  list(APPEND _COMPILER_ARGS "--iree-llvm-target-abi=ilp32")
+  list(APPEND _COMPILER_ARGS "--iree-llvm-link-embedded=false")
 
   if(_RULE_EMITC)
     # TODO(b/245584726): iree_c_module causes long build time for some models
@@ -94,9 +94,10 @@
     set(_MODULE_NAME "${_RULE_NAME}_emitc")
 
     get_filename_component(_MLIR_SRC "${_MLIR_SRC}" REALPATH)
-    list(APPEND _COMPILER_ARGS "-output-format=vm-c")
-    list(APPEND _COMPILER_ARGS "-iree-llvm-link-static")
-    list(APPEND _COMPILER_ARGS "-iree-llvm-static-library-output-path=${_O_FILE_NAME}")
+    list(APPEND _COMPILER_ARGS "--output-format=vm-c")
+    list(APPEND _COMPILER_ARGS "--iree-vm-target-index-bits=32")
+    list(APPEND _COMPILER_ARGS "--iree-llvm-link-static")
+    list(APPEND _COMPILER_ARGS "--iree-llvm-static-library-output-path=${_O_FILE_NAME}")
     list(APPEND _COMPILER_ARGS "${_MLIR_SRC}")
     list(APPEND _COMPILER_ARGS "-o")
     list(APPEND _COMPILER_ARGS "${_H_FILE_NAME}")

cmake/springbok_vmvx_module.cmake

diff --git a/cmake/springbok_vmvx_module.cmake b/cmake/springbok_vmvx_module.cmake
index 1a7a524..8fe916b 100644
--- a/cmake/springbok_vmvx_module.cmake
+++ b/cmake/springbok_vmvx_module.cmake
@@ -72,6 +72,7 @@
   list(APPEND _COMPILER_ARGS "--iree-hal-target-backends=vmvx")
 
   if(_RULE_EMITC)
+    list(APPEND _COMPILER_ARGS "--iree-vm-target-index-bits=32")
     set(_MODULE_NAME "${_RULE_NAME}_emitc")
     set(_H_FILE_NAME "${_RULE_NAME}_emitc.h")
     iree_c_module(