EISW-163564 Add CMake option to conditionally disable TosaToTensor conversion

Author: sramasit

mlir/CMakeLists.txt

@@ -200,6 +200,15 @@ 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

@@ -6,3 +6,7 @@ mlir_tablegen(Passes.capi.cpp.inc -gen-pass-capi-impl --prefix Conversion)
 add_public_tablegen_target(MLIRConversionPassIncGen)
 
 add_mlir_doc(Passes ConversionPasses ./ -gen-pass-doc)
+
+if(MLIR_CONVERSION_TOSATOTENSOR_ENABLE)
+  add_subdirectory(TosaToTensor)
+endif()

mlir/include/mlir/Conversion/Passes.h

@@ -70,7 +70,9 @@
 #include "mlir/Conversion/TosaToLinalg/TosaToLinalg.h"
 #include "mlir/Conversion/TosaToMLProgram/TosaToMLProgram.h"
 #include "mlir/Conversion/TosaToSCF/TosaToSCF.h"
-/* #include "mlir/Conversion/TosaToTensor/TosaToTensor.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

@@ -1216,18 +1216,18 @@ def TosaToSCF : Pass<"tosa-to-scf"> {
 // TosaToTensor
 //===----------------------------------------------------------------------===//
 
-// def TosaToTensor : Pass<"tosa-to-tensor"> {
-//  let summary = "Lower TOSA to the Tensor dialect";
-//  let dependentDialects = [
-//    "tensor::TensorDialect",
-//  ];
-//  let description = [{
-//    Pass that converts TOSA operations to the equivalent operations using the
-//    operations in the Tensor dialect.
-//  }];
-//
-//  let constructor = "tosa::createTosaToTensor()";
-//}
+def TosaToTensor : Pass<"tosa-to-tensor"> {
+  let summary = "Lower TOSA to the Tensor dialect";
+  let dependentDialects = [
+    "tensor::TensorDialect",
+  ];
+  let description = [{
+    Pass that converts TOSA operations to the equivalent operations using the
+    operations in the Tensor dialect.
+  }];
+
+  let constructor = "tosa::createTosaToTensor()";
+}
 
 //===----------------------------------------------------------------------===//
 // UBToLLVM

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

@@ -0,0 +1,8 @@
+
+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

@@ -78,8 +78,9 @@ add_subdirectory(TosaToArith)
 add_subdirectory(TosaToLinalg)
 add_subdirectory(TosaToMLProgram)
 add_subdirectory(TosaToSCF)
-# FIXME(askrebko): cannot be compiled: no conversion between ShapedType and TensorType
-# 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

@@ -0,0 +1,8 @@
+// RUN: mlir-opt --split-input-file -pass-pipeline="builtin.module(func.func(tosa-to-tensor))" %s -verify-diagnostics
+
+// CHECK-LABEL:  @slice_resultType_unranked
+func.func @slice_resultType_unranked(%arg0: tensor<?xf32>) -> (tensor<*xf32>) {
+  // expected-error@+1 {{failed to legalize operation 'tosa.slice'}}
+  %0 = "tosa.slice"(%arg0) {start = array<i64: 2>, size = array<i64: 0>} : (tensor<?xf32>)  -> (tensor<*xf32>)
+  return %0 : tensor<*xf32>
+}