diff --git a/README.en.md b/README.en.md index eb098f82cf7a82e8e5d6cd2898a60da6e080041d..aa12d04ab172133b18804bdbd4009f22a6e2d355 100644 --- a/README.en.md +++ b/README.en.md @@ -1,24 +1,3 @@ # llvm-mlir -#### Description -The MLIR project is a novel approach to building reusable and extensible compiler infrastructure. -MLIR aims to address software fragmentation, improve compilation for heterogeneous hardware, -significantly reduce the cost of building domain specific compilers, and aid in connecting -existing compilers together. - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +This package has been merged into [src-openeuler/llvm](https://gitee.com/src-openeuler/llvm) \ No newline at end of file diff --git a/README.md b/README.md index 8caea75e7ada1c60a256cb9b055e29a7d4118133..a50dbcadbb80263e8777db59541a065261bfc679 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,3 @@ # llvm-mlir -#### 介绍 -The MLIR project is a novel approach to building reusable and extensible compiler infrastructure. -MLIR aims to address software fragmentation, improve compilation for heterogeneous hardware, -significantly reduce the cost of building domain specific compilers, and aid in connecting -existing compilers together. - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +该软件包已合并入[src-openeuler/llvm](https://gitee.com/src-openeuler/llvm) \ No newline at end of file diff --git a/fedora-0001-mlir-python-Reuse-the-library-directory.patch b/fedora-0001-mlir-python-Reuse-the-library-directory.patch deleted file mode 100644 index 67a97661ff6da6e0ca8257d631e86f4365dafdc3..0000000000000000000000000000000000000000 --- a/fedora-0001-mlir-python-Reuse-the-library-directory.patch +++ /dev/null @@ -1,71 +0,0 @@ -From d8d712c632e925139a6e5e53ee64749301358b25 Mon Sep 17 00:00:00 2001 -From: Tulio Magno Quites Machado Filho -Date: Tue, 5 Sep 2023 10:35:37 -0300 -Subject: [PATCH] [mlir][python] Reuse the library directory - -Prefer to get the path to the shared libraries from config.llvm_shlib_dir. -Fallback to the previous path only if config.llvm_shlib_dir is not -defined. - -This ensures the test will pass regardless of the build configuration -used downstream. ---- - mlir/test/lit.cfg.py | 1 + - mlir/test/python/execution_engine.py | 12 +++++++----- - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py -index 3a8bdbfcec28..eb8e66a2491c 100644 ---- a/mlir/test/lit.cfg.py -+++ b/mlir/test/lit.cfg.py -@@ -130,6 +130,7 @@ tools.extend( - ToolSubst("toyc-ch7", unresolved="ignore"), - ToolSubst('transform-opt-ch2', unresolved='ignore'), - ToolSubst('transform-opt-ch3', unresolved='ignore'), -+ ToolSubst("%llvm_shlib_dir", config.llvm_shlib_dir, unresolved="ignore"), - ToolSubst("%mlir_lib_dir", config.mlir_lib_dir, unresolved="ignore"), - ToolSubst("%mlir_src_dir", config.mlir_src_root, unresolved="ignore"), - ] -diff --git a/mlir/test/python/execution_engine.py b/mlir/test/python/execution_engine.py -index e8b47007a890..0cb78dd0bac6 100644 ---- a/mlir/test/python/execution_engine.py -+++ b/mlir/test/python/execution_engine.py -@@ -1,4 +1,4 @@ --# RUN: %PYTHON %s 2>&1 | FileCheck %s -+# RUN: env LLVM_SHLIB_DIR=%llvm_shlib_dir %PYTHON %s 2>&1 | FileCheck %s - # REQUIRES: host-supports-jit - import gc, sys, os, tempfile - from mlir.ir import * -@@ -6,6 +6,8 @@ from mlir.passmanager import * - from mlir.execution_engine import * - from mlir.runtime import * - -+_DEFAULT_LIB_DIR = "../../../../lib" -+LIB_DIR = os.getenv("LLVM_SHLIB_DIR", _DEFAULT_LIB_DIR) - - # Log everything to stderr and flush so that we have a unified stream to match - # errors/info emitted by MLIR to stderr. -@@ -540,8 +542,8 @@ def testSharedLibLoad(): - ] - else: - shared_libs = [ -- "../../../../lib/libmlir_runner_utils.so", -- "../../../../lib/libmlir_c_runner_utils.so", -+ LIB_DIR + "/libmlir_runner_utils.so", -+ LIB_DIR + "/libmlir_c_runner_utils.so", - ] - - execution_engine = ExecutionEngine( -@@ -583,8 +585,8 @@ def testNanoTime(): - ] - else: - shared_libs = [ -- "../../../../lib/libmlir_runner_utils.so", -- "../../../../lib/libmlir_c_runner_utils.so", -+ LIB_DIR + "/libmlir_runner_utils.so", -+ LIB_DIR + "/libmlir_c_runner_utils.so", - ] - - execution_engine = ExecutionEngine( --- -2.41.0 \ No newline at end of file diff --git a/llvm-mlir.spec b/llvm-mlir.spec deleted file mode 100644 index 998c571c9f142e68142f4259cc8bde474e8e2e07..0000000000000000000000000000000000000000 --- a/llvm-mlir.spec +++ /dev/null @@ -1,228 +0,0 @@ -%bcond_without sys_llvm -%bcond_without check -%bcond_without toolchain_clang -%bcond_without bisheng_autotuner - -%if %{with toolchain_clang} -%global toolchain clang -%endif - -%global maj_ver 17 -%global min_ver 0 -%global patch_ver 6 -%global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} -%global mlir_srcdir mlir-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src - -%if %{with sys_llvm} -%global pkg_name mlir -%global install_prefix %{_prefix} -%global install_datadir %{_datadir} -%else -%global pkg_name mlir%{maj_ver} -%global install_prefix %{_libdir}/llvm%{maj_ver} -%global install_datadir %{install_prefix}/share -%endif - -%global install_bindir %{install_prefix}/bin -%if 0%{?__isa_bits} == 64 -%global install_libdir %{install_prefix}/lib64 -%else -%global install_libdir %{install_prefix}/lib -%endif -%global install_includedir %{install_prefix}/include - -Name: %{pkg_name} -Version: %{mlir_version} -Release: 3 -Summary: The MLIR project is a novel approach to building reusable and extensible compiler infrastructure. -License: Apache 2.0 -URL: https://mlir.llvm.org/ - -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}/%{mlir_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}/%{mlir_srcdir}.tar.xz.sig - -Patch0: fedora-0001-mlir-python-Reuse-the-library-directory.patch - -BuildRequires: clang -BuildRequires: gcc gcc-c++ cmake ninja-build zlib-devel python3-lit -%if %{with sys_llvm} -BuildRequires: llvm-devel = %{version} -BuildRequires: llvm-googletest = %{version} -BuildRequires: llvm-test = %{version} -BuildRequires: llvm-cmake-utils = %{version} -%else -BuildRequires: llvm%{maj_ver}-devel = %{version} -BuildRequires: llvm%{maj_ver}-googletest = %{version} -BuildRequires: llvm%{maj_ver}-test = %{version} -BuildRequires: llvm%{maj_ver}-cmake-utils = %{version} -%endif -BuildRequires: python3-devel -BuildRequires: python3-numpy -BuildRequires: python3-pybind11 -BuildRequires: python3-pyyaml - -%description -The MLIR project is a novel approach to building reusable and extensible compiler infrastructure. -MLIR aims to address software fragmentation, improve compilation for heterogeneous hardware, -significantly reduce the cost of building domain specific compilers, and aid in connecting -existing compilers together. - -%package static -Summary: MLIR static files -Requires: %{name} = %{version} - -%description static -MLIR static files. - -%package devel -Summary: MLIR development files -Requires: %{name} = %{version}-%{release} -Requires: %{name}-static = %{version}-%{release} - -%description devel -MLIR development files. - -%package -n python3-%{name} -Summary: MLIR python bindings -Requires: python3 -Requires: python3-numpy - -%description -n python3-%{name} -%{summary} - -%prep -%autosetup -n %{mlir_srcdir} -p2 - -%build -%cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=ON \ - -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DCMAKE_PREFIX_PATH=%{install_libdir}/cmake/llvm/ \ - -DLLVM_EXTERNAL_LIT=%{install_bindir}/lit \ - -DLLVM_THIRD_PARTY_DIR=%{install_datadir}/llvm/src/utils \ - -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \ - -DLLVM_BUILD_UTILS:BOOL=ON \ - -DLLVM_LIBRARY_OUTPUT_INTDIR="." \ - -DLLVM_SHLIB_OUTPUT_INTDIR="%{_builddir}/%{mlir_srcdir}/lib/ExecutionEngine/" \ - -DMLIR_INCLUDE_DOCS:BOOL=ON \ - -DMLIR_INCLUDE_TESTS:BOOL=ON \ - -DMLIR_INCLUDE_INTEGRATION_TESTS:BOOL=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF \ - -DMLIR_BUILD_MLIR_C_DYLIB=ON \ -%if "%{toolchain}" == "clang" - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ -%endif -%if %{with bisheng_autotuner} - -DLLVM_ENABLE_AUTOTUNER=ON \ -%endif -%ifarch aarch64 %ix86 ppc64le x86_64 - -DLLVM_PARALLEL_LINK_JOBS=1 \ -%endif -%ifarch %ix86 - -DMLIR_RUN_X86VECTOR_TESTS:BOOL=OFF \ -%endif - -DMLIR_ENABLE_BINDINGS_PYTHON:BOOL=ON \ -%if 0%{?__isa_bits} == 64 - -DLLVM_LIBDIR_SUFFIX=64 \ -%else - -DLLVM_LIBDIR_SUFFIX= -%endif -%ifarch %ix86 x86_64 - -DLLVM_TARGETS_TO_BUILD="X86" -%endif -%ifarch aarch64 - -DLLVM_TARGETS_TO_BUILD="AArch64" -%endif - -%ninja_build - -%install -%ninja_install - -mkdir -p %{buildroot}/%{python3_sitearch} -mv %{buildroot}/usr/python_packages/mlir_core/mlir %{buildroot}/%{python3_sitearch} -# These directories should be empty now. -rmdir %{buildroot}/usr/python_packages/mlir_core %{buildroot}/usr/python_packages -# Unneeded files. -rm -rf %{buildroot}/usr/src/python - -%check -%if %{with check} -# TODO: Investigate the following issues. -rm -rf test/mlir-pdll-lsp-server/compilation_database.test -rm -rf test/mlir-pdll-lsp-server/completion.test -rm -rf test/mlir-pdll-lsp-server/definition-split-file.test -rm -rf test/mlir-pdll-lsp-server/definition.test -rm -rf test/mlir-pdll-lsp-server/document-links.test -rm -rf test/mlir-pdll-lsp-server/document-symbols.test -rm -rf test/mlir-pdll-lsp-server/exit-eof.test -rm -rf test/mlir-pdll-lsp-server/exit-with-shutdown.test -rm -rf test/mlir-pdll-lsp-server/exit-without-shutdown.test -rm -rf test/mlir-pdll-lsp-server/hover.test -rm -rf test/mlir-pdll-lsp-server/initialize-params-invalid.test -rm -rf test/mlir-pdll-lsp-server/initialize-params.test -rm -rf test/mlir-pdll-lsp-server/inlay-hints.test -rm -rf test/mlir-pdll-lsp-server/references.test -rm -rf test/mlir-pdll-lsp-server/signature-help.test -rm -rf test/mlir-pdll-lsp-server/textdocument-didchange.test -rm -rf test/mlir-pdll-lsp-server/view-output.test - -rm -rf test/mlir-tblgen/directive-common.td -rm -rf test/mlir-tblgen/llvm-intrinsics.td -rm -rf test/tblgen-lsp-server/document-links.test -rm -rf test/tblgen-lsp-server/hover.test - -# build process .exe tools normally use rpath or static linkage -export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{python3_sitearch}/mlir/_mlir_libs -export PYTHONPATH=%{buildroot}/%{python3_sitearch} -%ninja_build check-mlir -%endif - -%files -%license LICENSE.TXT -%{install_libdir}/libMLIR*.so.* -%{install_libdir}/libmlir_runner_utils.so.* -%{install_libdir}/libmlir_c_runner_utils.so.* -%{install_libdir}/libmlir_float16_utils.so.%{maj_ver}* -%{install_libdir}/libmlir_async_runtime.so.* - -%files static -%{install_libdir}/libMLIR*.a - -%files devel -%{install_bindir}/mlir-tblgen -%{install_bindir}/mlir-pdll -%{install_libdir}/libMLIR*.so -%{install_libdir}/libmlir_runner_utils.so -%{install_libdir}/libmlir_c_runner_utils.so -%{install_libdir}/libmlir_float16_utils.so -%{install_libdir}/libmlir_async_runtime.so -%{install_includedir}/mlir -%{install_includedir}/mlir-c -%{install_libdir}/cmake/mlir - -%files -n python3-%{name} -%{python3_sitearch}/mlir/ - -%changelog -* Tue Aug 20 2024 liyunfei - 17.0.6-3 -- Add BiSheng Autotuner support. - -* Fri Jul 5 2024 liyunfei - 17.0.6-2 -- Add toolchain_clang build support - -* Sun Jun 25 2023 zhoujing - 17.0.6-1 -- Update to 17.0.6 - -* Sun Jun 25 2023 cf-zhao - 15.0.7-1 -- Update to 15.0.7 - -* Wed Nov 16 2022 liyancheng <412998149@qq.com> - 12.0.1-0 -- Type:Init -- ID:NA -- SUG:NA -- DESC:Init llvm-mlir repository diff --git a/mlir-17.0.6.src.tar.xz b/mlir-17.0.6.src.tar.xz deleted file mode 100644 index 22f5ecd892ef2fbaceafeead4b33fdf4e2328647..0000000000000000000000000000000000000000 Binary files a/mlir-17.0.6.src.tar.xz and /dev/null differ diff --git a/mlir-17.0.6.src.tar.xz.sig b/mlir-17.0.6.src.tar.xz.sig deleted file mode 100644 index 9c93a0a1f0b31d5f82ef86685c63d410ab0c00f2..0000000000000000000000000000000000000000 Binary files a/mlir-17.0.6.src.tar.xz.sig and /dev/null differ