mlir v16.0.0

recipe/bld.bat

@@ -1,3 +1,4 @@
+@echo on
 mkdir build
 cd build
 

recipe/build.sh

@@ -9,7 +9,7 @@ fi
 
 if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == "1" ]]; then
   CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_TABLEGEN_EXE=$BUILD_PREFIX/bin/llvm-tblgen -DNATIVE_LLVM_DIR=$BUILD_PREFIX/lib/cmake/llvm"
-  CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_C_COMPILER=$CC_FOR_BUILD;-DCMAKE_CXX_COMPILER=$CXX_FOR_BUILD;-DCMAKE_C_FLAGS=-O2;-DCMAKE_CXX_FLAGS=-O2;-DCMAKE_EXE_LINKER_FLAGS=\"-L$BUILD_PREFIX/lib\";-DCMAKE_MODULE_LINKER_FLAGS=;-DCMAKE_SHARED_LINKER_FLAGS=;-DCMAKE_STATIC_LINKER_FLAGS=;-DCMAKE_AR=$(which ${AR});-DCMAKE_RANLIB=$(which ${RANLIB});-DZLIB_ROOT=${BUILD_PREFIX}"
+  CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_C_COMPILER=$CC_FOR_BUILD;-DCMAKE_CXX_COMPILER=$CXX_FOR_BUILD;-DCMAKE_C_FLAGS=-O2;-DCMAKE_CXX_FLAGS=-O2;-DCMAKE_EXE_LINKER_FLAGS=\"-L$BUILD_PREFIX/lib\";-DCMAKE_MODULE_LINKER_FLAGS=;-DCMAKE_SHARED_LINKER_FLAGS=;-DCMAKE_STATIC_LINKER_FLAGS=;-DCMAKE_AR=$(which ${AR});-DCMAKE_RANLIB=$(which ${RANLIB});-DCMAKE_PREFIX_PATH=${BUILD_PREFIX}"
 else
   rm -rf $BUILD_PREFIX/bin/llvm-tblgen
 fi

recipe/conda_build_config.yaml

@@ -2,7 +2,3 @@ c_compiler:         # [osx and arm64]
   - clang_bootstrap # [osx and arm64]
 cxx_compiler:       # [osx and arm64]
   - clang_bootstrap # [osx and arm64]
-c_compiler:            # [win]
-- vs2019               # [win]
-cxx_compiler:          # [win]
-- vs2019               # [win]

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "15.0.7" %}
+{% set version = "16.0.0" %}
 {% set major_version = version.split(".")[0] %}
 
 package:
@@ -7,10 +7,10 @@ package:
 
 source:
   - url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz
-    sha256: 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
+    sha256: 9a56d906a2c81f16f06efc493a646d497c53c2f4f28f0cb1f3c8da7f74350254
     patches:
       # https://reviews.llvm.org/D99470
-      - 0001-Support-cross-compiling-standalone-MLIR.patch
+      - patches/0001-Support-cross-compiling-standalone-MLIR.patch
 
 build:
   number: 0

recipe/0001-Support-cross-compiling-standalone-MLIR.patch → recipe/patches/0001-Support-cross-compiling-standalone-MLIR.patch

@@ -1,4 +1,4 @@
-From a43d733a668d9cba02eeb79a49cbdaed17e3749a Mon Sep 17 00:00:00 2001
+From 23936ca8ed236eec1201051962900334c4455ab3 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Tue, 6 Apr 2021 13:36:08 +0200
 Subject: [PATCH] Support cross compiling standalone MLIR
@@ -8,18 +8,18 @@ Subject: [PATCH] Support cross compiling standalone MLIR
  1 file changed, 13 insertions(+)
 
 diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt
-index 088aec88f..9ba5afcbf 100644
+index ab690b16a4..f00c819b25 100644
 --- a/mlir/CMakeLists.txt
 +++ b/mlir/CMakeLists.txt
-@@ -30,6 +30,7 @@ if(MLIR_STANDALONE_BUILD)
-   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-     "${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
+@@ -42,6 +42,7 @@ if(MLIR_STANDALONE_BUILD)
    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
+
+   set(LLVM_LIT_ARGS "-sv" CACHE STRING "Default options for lit")
 +  set(MLIR_BUILT_STANDALONE 1)
  endif()
 
  set(MLIR_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
-@@ -155,6 +156,18 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -163,6 +164,18 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
  include_directories( "include")
  include_directories( ${MLIR_INCLUDE_DIR})
 
@@ -39,5 +39,5 @@ index 088aec88f..9ba5afcbf 100644
  # MLIR_TABLEGEN_EXE in PARENT_SCOPE which gets lost if that folder is included
  # from another directory like tools
 -- 
-2.38.0
+2.38.1.windows.1