EISW-163564 Add CMake option to conditionally disable TosaToTensor conversion

Author: sramasit

mlir/CMakeLists.txt

@@ -221,6 +221,24 @@ set(MLIR_PDLL_TABLEGEN_TARGET "${MLIR_PDLL_TABLEGEN_TARGET}" CACHE INTERNAL "")
 set(MLIR_SRC_SHARDER_TABLEGEN_EXE "${MLIR_SRC_SHARDER_TABLEGEN_EXE}" CACHE INTERNAL "")
 set(MLIR_SRC_SHARDER_TABLEGEN_TARGET "${MLIR_SRC_SHARDER_TABLEGEN_TARGET}" CACHE INTERNAL "")
 
+# XeGPU Dialect Option (Default OFF)
+option(MLIR_DIALECT_XEGPU_ENABLE
+       "Enable the XeGPU dialect."
+       OFF)
+
+if(MLIR_DIALECT_XEGPU_ENABLE)
+  add_compile_definitions(MLIR_DIALECT_XEGPU_ENABLE)
+endif()
+
+# TosaToTensor Conversion Option (Default OFF)
+option(MLIR_CONVERSION_TOSATOTENSOR_ENABLE 
+       "Enable TosaToTensor conversion" 
+       OFF)
+
+if(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+  add_compile_definitions(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+endif()
+
 add_subdirectory(include/mlir)
 add_subdirectory(lib)
 # C API needs all dialects for registration, but should be built before tests.

mlir/include/mlir/Conversion/CMakeLists.txt

@@ -7,4 +7,7 @@ add_public_tablegen_target(MLIRConversionPassIncGen)
 
 add_mlir_doc(Passes ConversionPasses ./ -gen-pass-doc)
 
+if(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+  add_subdirectory(TosaToTensor)
+endif()
 add_subdirectory(ConvertToLLVM)

mlir/include/mlir/Conversion/Passes.h

@@ -71,7 +71,9 @@
 #include "mlir/Conversion/TosaToLinalg/TosaToLinalg.h"
 #include "mlir/Conversion/TosaToMLProgram/TosaToMLProgram.h"
 #include "mlir/Conversion/TosaToSCF/TosaToSCF.h"
+#ifdef MLIR_CONVERSION_TOSATOTENSOR_ENABLE
 #include "mlir/Conversion/TosaToTensor/TosaToTensor.h"
+#endif
 #include "mlir/Conversion/UBToLLVM/UBToLLVM.h"
 #include "mlir/Conversion/UBToSPIRV/UBToSPIRV.h"
 #include "mlir/Conversion/VectorToArmSME/VectorToArmSME.h"

mlir/include/mlir/Conversion/Passes.td

@@ -1259,7 +1259,7 @@ def TosaToSCF : Pass<"tosa-to-scf"> {
 //===----------------------------------------------------------------------===//
 // TosaToTensor
 //===----------------------------------------------------------------------===//
-
+#ifdef MLIR_CONVERSION_TOSATOTENSOR_ENABLE
 def TosaToTensor : Pass<"tosa-to-tensor"> {
   let summary = "Lower TOSA to the Tensor dialect";
   let dependentDialects = [
@@ -1272,6 +1272,7 @@ def TosaToTensor : Pass<"tosa-to-tensor"> {
 
   let constructor = "tosa::createTosaToTensor()";
 }
+#endif
 
 //===----------------------------------------------------------------------===//
 // UBToLLVM

mlir/include/mlir/Conversion/TosaToTensor/CMakeLists.txt

@@ -0,0 +1,7 @@
+if(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+  set(LLVM_TARGET_DEFINITIONS Passes.td)
+  mlir_tablegen(Passes.h.inc -gen-pass-decls -name TosaToTensor)
+  mlir_tablegen(Passes.capi.h.inc -gen-pass-capi-header --prefix TosaToTensor)
+  mlir_tablegen(Passes.capi.cpp.inc -gen-pass-capi-impl --prefix TosaToTensor)
+  add_public_tablegen_target(MLIRTosaToTensorPassIncGen)
+endif()

mlir/lib/Conversion/CMakeLists.txt

@@ -80,7 +80,9 @@ add_subdirectory(TosaToArith)
 add_subdirectory(TosaToLinalg)
 add_subdirectory(TosaToMLProgram)
 add_subdirectory(TosaToSCF)
-add_subdirectory(TosaToTensor)
+if(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+  add_subdirectory(TosaToTensor)
+endif()
 add_subdirectory(UBToLLVM)
 add_subdirectory(UBToSPIRV)
 add_subdirectory(VectorToArmSME)

mlir/lib/Conversion/TosaToTensor/CMakeLists.txt

@@ -1,20 +1,22 @@
-add_mlir_conversion_library(MLIRTosaToTensor
-  TosaToTensor.cpp
-  TosaToTensorPass.cpp
+if(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+  add_mlir_conversion_library(MLIRTosaToTensor
+    TosaToTensor.cpp
+    TosaToTensorPass.cpp
 
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Tosa
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
+    ADDITIONAL_HEADER_DIRS
+    ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Tosa
+    ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
 
-  DEPENDS
-  MLIRConversionPassIncGen
+    DEPENDS
+    MLIRConversionPassIncGen
 
-  LINK_LIBS PUBLIC
-  MLIRTensorDialect
-  MLIRTensorUtils
-  MLIRIR
-  MLIRPass
-  MLIRTosaDialect
-  MLIRTosaTransforms
-  MLIRSupport
-  )
+    LINK_LIBS PUBLIC
+    MLIRTensorDialect
+    MLIRTensorUtils
+    MLIRIR
+    MLIRPass
+    MLIRTosaDialect
+    MLIRTosaTransforms
+    MLIRSupport
+    )
+endif()

mlir/test/Conversion/TosaToTensor/tosa-to-tensor-invalid.mlir

@@ -1,3 +1,4 @@
+// REQUIRES: tosa-to-tensor-enabled
 // RUN: mlir-opt --split-input-file -pass-pipeline="builtin.module(func.func(tosa-to-tensor))" %s -verify-diagnostics
 
 // CHECK-LABEL:  @slice_resultType_unranked

mlir/test/Conversion/TosaToTensor/tosa-to-tensor.mlir

@@ -1,3 +1,4 @@
+// REQUIRES: tosa-to-tensor-enabled
 // RUN: mlir-opt --split-input-file --tosa-to-tensor %s -o -| FileCheck %s
 
 // -----

mlir/test/lit.site.cfg.py.in

@@ -69,6 +69,10 @@ config.riscv_vector_emulator_options = "@RISCV_VECTOR_EMULATOR_OPTIONS@"
 config.riscv_emulator_lli_executable = "@RISCV_EMULATOR_LLI_EXECUTABLE@"
 config.riscv_emulator_utils_lib_dir = "@RISCV_EMULATOR_UTILS_LIB_DIR@"
 
+# Add feature to enable/disable TosaTotensor tests
+if "@MLIR_CONVERSION_TOSATOTENSOR_ENABLE@" == "ON":
+    config.available_features.add("tosa-to-tensor-enabled")
+
 import lit.llvm
 lit.llvm.initialize(lit_config, config)