From ffba71f84f52a23bbb9eda2fc40589206c997d3a Mon Sep 17 00:00:00 2001 From: Jakub Kuderski Date: Wed, 18 Jun 2025 14:20:35 -0400 Subject: [PATCH 1/3] Revert "[mlir] mlir/test/lit.local.cfg -> mlir/test/Target/SPIRV/lit.local.cfg (#144685)" This reverts commit 8584abb05a84d3bf4e84cdfe4154d7ade8bdfd04. --- mlir/test/{Target/SPIRV => }/lit.local.cfg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mlir/test/{Target/SPIRV => }/lit.local.cfg (100%) diff --git a/mlir/test/Target/SPIRV/lit.local.cfg b/mlir/test/lit.local.cfg similarity index 100% rename from mlir/test/Target/SPIRV/lit.local.cfg rename to mlir/test/lit.local.cfg From 71f05749c37cd539dcad3947b930be79974e18d5 Mon Sep 17 00:00:00 2001 From: Jakub Kuderski Date: Wed, 18 Jun 2025 14:21:21 -0400 Subject: [PATCH 2/3] Revert "Port #143108 to bazel (#144538)" This reverts commit 7ec103a984ff114d24f26d935fe2292379269b53. --- utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel index a439fdd50d21c..51731b1e8f745 100644 --- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel @@ -37,7 +37,6 @@ expand_template( # All disabled, but required to substituted because they are not in quotes. "@LLVM_BUILD_EXAMPLES@": "0", "@LLVM_HAS_NVPTX_TARGET@": "0", - "@LLVM_INCLUDE_SPIRV_TOOLS_TESTS@": "0", "@MLIR_ENABLE_CUDA_RUNNER@": "0", "@MLIR_ENABLE_ROCM_CONVERSIONS@": "0", "@MLIR_ENABLE_ROCM_RUNNER@": "0", From 64e2319e0c428dbf6a572a705d93b7c9c2945718 Mon Sep 17 00:00:00 2001 From: Jakub Kuderski Date: Wed, 18 Jun 2025 14:21:48 -0400 Subject: [PATCH 3/3] Revert "[mlir][spirv] Fix int type declaration duplication when serializing (#143108)" This reverts commit 549bc55cc39bb9fb22df464bcf3b7d4d4a5ff507. --- mlir/lib/Target/SPIRV/Serialization/Serializer.cpp | 13 ------------- mlir/test/CMakeLists.txt | 6 ------ mlir/test/Target/SPIRV/constant.mlir | 5 +---- mlir/test/lit.cfg.py | 1 - mlir/test/lit.local.cfg | 7 ------- mlir/test/lit.site.cfg.py.in | 4 +--- 6 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 mlir/test/lit.local.cfg diff --git a/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp b/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp index 56c64f38fe29a..d258bfd852961 100644 --- a/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp +++ b/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp @@ -446,19 +446,6 @@ LogicalResult Serializer::processType(Location loc, Type type, LogicalResult Serializer::processTypeImpl(Location loc, Type type, uint32_t &typeID, SetVector &serializationCtx) { - - // Map unsigned integer types to singless integer types. - // This is needed otherwise the generated spirv assembly will contain - // twice a type declaration (like OpTypeInt 32 0) which is no permitted and - // such module fails validation. Indeed at MLIR level the two types are - // different and lookup in the cache below misses. - // Note: This conversion needs to happen here before the type is looked up in - // the cache. - if (type.isUnsignedInteger()) { - type = IntegerType::get(loc->getContext(), type.getIntOrFloatBitWidth(), - IntegerType::SignednessSemantics::Signless); - } - typeID = getTypeID(type); if (typeID) return success(); diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt index 89568e7766ae5..ac8b44f53aebf 100644 --- a/mlir/test/CMakeLists.txt +++ b/mlir/test/CMakeLists.txt @@ -68,7 +68,6 @@ endif() llvm_canonicalize_cmake_booleans( LLVM_BUILD_EXAMPLES LLVM_HAS_NVPTX_TARGET - LLVM_INCLUDE_SPIRV_TOOLS_TESTS MLIR_ENABLE_BINDINGS_PYTHON MLIR_ENABLE_CUDA_RUNNER MLIR_ENABLE_ROCM_CONVERSIONS @@ -218,11 +217,6 @@ if(MLIR_ENABLE_BINDINGS_PYTHON) ) endif() -if (LLVM_INCLUDE_SPIRV_TOOLS_TESTS) - list(APPEND MLIR_TEST_DEPENDS spirv-as) - list(APPEND MLIR_TEST_DEPENDS spirv-val) -endif() - # This target can be used to just build the dependencies # for the check-mlir target without executing the tests. # This is useful for bots when splitting the build step diff --git a/mlir/test/Target/SPIRV/constant.mlir b/mlir/test/Target/SPIRV/constant.mlir index 50d9b09ee0042..8d4e53418b70f 100644 --- a/mlir/test/Target/SPIRV/constant.mlir +++ b/mlir/test/Target/SPIRV/constant.mlir @@ -1,7 +1,6 @@ // RUN: mlir-translate --no-implicit-module --test-spirv-roundtrip %s | FileCheck %s -// RUN: %if spirv-tools %{ mlir-translate -no-implicit-module -serialize-spirv %s | spirv-val %} -spirv.module Logical Vulkan requires #spirv.vce { +spirv.module Logical GLSL450 requires #spirv.vce { // CHECK-LABEL: @bool_const spirv.func @bool_const() -> () "None" { // CHECK: spirv.Constant true @@ -306,6 +305,4 @@ spirv.module Logical Vulkan requires #spirv.vce : !spirv.coopmatrix<16x16xi8, Subgroup, MatrixAcc> spirv.ReturnValue %coop : !spirv.coopmatrix<16x16xi8, Subgroup, MatrixAcc> } - - spirv.EntryPoint "GLCompute" @bool_const } diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py index a6f1ac0d568f4..9b5cadd62befc 100644 --- a/mlir/test/lit.cfg.py +++ b/mlir/test/lit.cfg.py @@ -332,7 +332,6 @@ def find_real_python_interpreter(): else: config.available_features.add("noasserts") -config.targets = frozenset(config.targets_to_build.split()) def have_host_jit_feature_support(feature_name): mlir_runner_exe = lit.util.which("mlir-runner", config.mlir_tools_dir) diff --git a/mlir/test/lit.local.cfg b/mlir/test/lit.local.cfg deleted file mode 100644 index 167c454db5184..0000000000000 --- a/mlir/test/lit.local.cfg +++ /dev/null @@ -1,7 +0,0 @@ -if not "SPIRV" in config.root.targets: - config.unsupported = True - -if config.spirv_tools_tests: - config.available_features.add("spirv-tools") - config.substitutions.append(("spirv-as", os.path.join(config.llvm_tools_dir, "spirv-as"))) - config.substitutions.append(("spirv-val", os.path.join(config.llvm_tools_dir, "spirv-val"))) diff --git a/mlir/test/lit.site.cfg.py.in b/mlir/test/lit.site.cfg.py.in index 77f24e0f29b09..132aabe135940 100644 --- a/mlir/test/lit.site.cfg.py.in +++ b/mlir/test/lit.site.cfg.py.in @@ -5,8 +5,6 @@ import sys config.target_triple = "@LLVM_TARGET_TRIPLE@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") -config.spirv_tools_tests = @LLVM_INCLUDE_SPIRV_TOOLS_TESTS@ -config.targets_to_build = "@TARGETS_TO_BUILD@" config.llvm_shlib_ext = "@SHLIBEXT@" config.llvm_shlib_dir = lit_config.substitute(path(r"@SHLIBDIR@")) config.python_executable = "@Python3_EXECUTABLE@" @@ -43,7 +41,7 @@ config.mlir_run_amx_tests = @MLIR_RUN_AMX_TESTS@ config.mlir_run_arm_sve_tests = @MLIR_RUN_ARM_SVE_TESTS@ # This is a workaround for the fact that LIT's: # %if -# requires to be in the set of available features. +# requires to be in the set of available features. # TODO: Update LIT's TestRunner so that this is not required. if config.mlir_run_arm_sve_tests: config.available_features.add("mlir_arm_sve_tests")