Skip to content

Commit bc95b47

Browse files
Garra1980silee2
andauthored
[LLVM Pulldown] Bump LLVM to rev f2e244f443c99f814216bef37a82f1b8d3e5… (#1094)
Co-authored-by: Sang Ik Lee <[email protected]>
1 parent 36cd847 commit bc95b47

File tree

65 files changed

+538
-2972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+538
-2972
lines changed

build_tools/llvm_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6b7e1b97f4bbb6dd6fca04ee4caccbf54ec92f09
1+
f2e244f443c99f814216bef37a82f1b8d3e5975d

build_tools/patches/0001-Add-support-for-VectorAnyINTEL-capability.patch

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 46f1b01b6cde4956f4b08985adc59dd530788d4a Mon Sep 17 00:00:00 2001
1+
From 4167e203a75627ca13d8ea7560aaea9a6bb506f0 Mon Sep 17 00:00:00 2001
22
From: Garra1980 <[email protected]>
3-
Date: Fri, 13 Jun 2025 19:12:11 +0200
3+
Date: Sat, 12 Jul 2025 00:39:57 +0200
44
Subject: [PATCH] Add support for VectorAnyINTEL capability
55

66
---
@@ -24,10 +24,10 @@ Subject: [PATCH] Add support for VectorAnyINTEL capability
2424
17 files changed, 322 insertions(+), 69 deletions(-)
2525

2626
diff --git a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
27-
index d2ba76cdad90..ac491f6068a0 100644
27+
index 910418f1706a..29af93d8e752 100644
2828
--- a/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
2929
+++ b/mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td
30-
@@ -4194,7 +4194,14 @@ def SPIRV_BFloat16KHR : TypeAlias<BF16, "BFloat16">;
30+
@@ -4217,7 +4217,14 @@ def SPIRV_BFloat16KHR : TypeAlias<BF16, "BFloat16">;
3131
def SPIRV_Float : FloatOfWidths<[16, 32, 64]>;
3232
def SPIRV_Float16or32 : FloatOfWidths<[16, 32]>;
3333
def SPIRV_AnyFloat : AnyTypeOf<[SPIRV_Float, SPIRV_BFloat16KHR]>;
@@ -43,7 +43,7 @@ index d2ba76cdad90..ac491f6068a0 100644
4343
[SPIRV_Bool, SPIRV_Integer, SPIRV_AnyFloat]>;
4444
// Component type check is done in the type parser for the following SPIR-V
4545
// dialect-specific types so we use "Any" here.
46-
@@ -4245,7 +4252,7 @@ class SPIRV_MatrixOfType<list<Type> allowedTypes> :
46+
@@ -4270,7 +4277,7 @@ class SPIRV_MatrixOfType<list<Type> allowedTypes> :
4747
"Matrix">;
4848

4949
class SPIRV_VectorOf<Type type> :
@@ -150,7 +150,7 @@ index 45ec1846580f..6ca59f91eee9 100644
150150
// Negative values for `n` index in reverse.
151151
class ShapedTypeWithNthDimOfSize<int n, list<int> allowedSizes> : Type<
152152
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
153-
index a21acef1c4b4..a7c60f6bf1cb 100644
153+
index 88c7adf3dfcb..d29c88a1fd53 100644
154154
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
155155
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
156156
@@ -188,9 +188,12 @@ static Type parseAndVerifyType(SPIRVDialect const &dialect,
@@ -169,10 +169,10 @@ index a21acef1c4b4..a7c60f6bf1cb 100644
169169
return Type();
170170
}
171171
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
172-
index 93e0c9b33c54..a349da00027e 100644
172+
index 2b90df42af5c..34f25f2b3bc9 100644
173173
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
174174
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
175-
@@ -100,9 +100,10 @@ bool CompositeType::classof(Type type) {
175+
@@ -101,9 +101,10 @@ bool CompositeType::classof(Type type) {
176176
}
177177

178178
bool CompositeType::isValid(VectorType type) {
@@ -186,7 +186,7 @@ index 93e0c9b33c54..a349da00027e 100644
186186
}
187187

188188
Type CompositeType::getElementType(unsigned index) const {
189-
@@ -164,7 +165,21 @@ void CompositeType::getCapabilities(
189+
@@ -174,7 +175,21 @@ void CompositeType::getCapabilities(
190190
.Case<VectorType>([&](VectorType type) {
191191
auto vecSize = getNumElements();
192192
if (vecSize == 8 || vecSize == 16) {
@@ -210,7 +210,7 @@ index 93e0c9b33c54..a349da00027e 100644
210210
capabilities.push_back(ref);
211211
}
212212
diff --git a/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp b/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp
213-
index f5a58c58e05d..406e81235e10 100644
213+
index 1e7bb046d375..24e633da72aa 100644
214214
--- a/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp
215215
+++ b/mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp
216216
@@ -87,9 +87,13 @@ static std::optional<SmallVector<int64_t>> getTargetShape(VectorType vecType) {
@@ -499,15 +499,15 @@ index 1737f4a906bf..13f4e17167ef 100644
499499
} // end module
500500

501501
diff --git a/mlir/test/Dialect/SPIRV/IR/arithmetic-ops.mlir b/mlir/test/Dialect/SPIRV/IR/arithmetic-ops.mlir
502-
index d58c27598f2b..4c22244c08e0 100644
502+
index 3adafc15c79f..f75fd6cb0d39 100644
503503
--- a/mlir/test/Dialect/SPIRV/IR/arithmetic-ops.mlir
504504
+++ b/mlir/test/Dialect/SPIRV/IR/arithmetic-ops.mlir
505-
@@ -339,7 +339,7 @@ func.func @dot(%arg0: vector<4xf32>, %arg1: vector<4xf32>) -> f16 {
505+
@@ -348,7 +348,7 @@ func.func @dot(%arg0: vector<4xf32>, %arg1: vector<4xf32>) -> f16 {
506506
// -----
507507

508508
func.func @dot(%arg0: vector<4xi32>, %arg1: vector<4xi32>) -> i32 {
509-
- // expected-error @+1 {{'spirv.Dot' op operand #0 must be vector of 16/32/64-bit float values of length 2/3/4/8/16}}
510-
+ // expected-error @+1 {{op operand #0 must be vector of 16/32/64-bit float values of length 2-4294967295, but got 'vector<4xi32>'}}
509+
- // expected-error @+1 {{'spirv.Dot' op operand #0 must be vector of 16/32/64-bit float or BFloat16 values of length 2/3/4/8/16}}
510+
+ // expected-error @+1 {{op operand #0 must be vector of 16/32/64-bit float or BFloat16 values of length 2-4294967295, but got 'vector<4xi32>'}}
511511
%0 = spirv.Dot %arg0, %arg1 : vector<4xi32> -> i32
512512
return %0 : i32
513513
}
@@ -543,7 +543,7 @@ index f3f0ebf60f46..1138f38bcef2 100644
543543
return %0 : f16
544544
}
545545
diff --git a/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir b/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
546-
index 642346cc40b0..10ede222ada7 100644
546+
index 5c5d94c40e57..8edaa3762c23 100644
547547
--- a/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
548548
+++ b/mlir/test/Dialect/SPIRV/IR/gl-ops.mlir
549549
@@ -27,7 +27,7 @@ func.func @exp(%arg0 : i32) -> () {
@@ -722,7 +722,7 @@ index 8f021ed3d663..21558b9607f8 100644
722722
// expected-error @+1 {{expected ':'}}
723723
%2 = spirv.CL.s_abs %arg0, %arg1 : i32
724724
diff --git a/mlir/test/Target/SPIRV/arithmetic-ops.mlir b/mlir/test/Target/SPIRV/arithmetic-ops.mlir
725-
index b1ea13c6854f..90144afc6f3a 100644
725+
index b80e17f979da..32103f7b9c57 100644
726726
--- a/mlir/test/Target/SPIRV/arithmetic-ops.mlir
727727
+++ b/mlir/test/Target/SPIRV/arithmetic-ops.mlir
728728
@@ -6,9 +6,9 @@ spirv.module Logical GLSL450 requires #spirv.vce<v1.0, [Shader], []> {

include/imex/Conversion/Passes.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <imex/Conversion/XeGPUToVC/XeGPUToVC.h>
2929
#include <imex/Conversion/XeGPUToXeVM/XeGPUToXeVM.h>
3030
#include <imex/Conversion/XeTileToXeGPU/XeTileToXeGPU.h>
31-
#include <imex/Conversion/XeVMToLLVM/XeVMToLLVM.h>
3231

3332
namespace imex {
3433

include/imex/Conversion/Passes.td

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -466,17 +466,6 @@ def ConvertArithToVC : Pass<"convert-arith-to-vc", "::mlir::gpu::GPUModuleOp"> {
466466
let constructor = "imex::createConvertArithToVCPass()";
467467
}
468468

469-
//===----------------------------------------------------------------------===//
470-
// XeVMToLLVM
471-
//===----------------------------------------------------------------------===//
472-
473-
def ConvertXeVMToLLVMPass : Pass<"convert-xevm-to-llvm"> {
474-
let summary = "Convert XeVM to LLVM dialect";
475-
let dependentDialects = [
476-
"imex::xevm::XeVMDialect",
477-
];
478-
}
479-
480469
//===----------------------------------------------------------------------===//
481470
// XeGPUToXeVM
482471
//===----------------------------------------------------------------------===//
@@ -485,7 +474,7 @@ def ConvertXeGPUToXeVMPass : Pass<"convert-xegpu-to-xevm"> {
485474
let summary = "Convert XeGPU to XeVM dialect";
486475
let dependentDialects = [
487476
"::mlir::xegpu::XeGPUDialect",
488-
"::imex::xevm::XeVMDialect",
477+
"::mlir::xevm::XeVMDialect",
489478
"::mlir::vector::VectorDialect",
490479
"::mlir::memref::MemRefDialect",
491480
"::mlir::arith::ArithDialect",

include/imex/Conversion/XeVMToLLVM/Mangling.h

Lines changed: 0 additions & 47 deletions
This file was deleted.

include/imex/Conversion/XeVMToLLVM/XeVMToLLVM.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

include/imex/Dialect/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ add_subdirectory(DistRuntime)
22
add_subdirectory(NDArray)
33
add_subdirectory(Region)
44
add_subdirectory(GPUX)
5-
add_subdirectory(LLVMIR)
65
add_subdirectory(XeTile)

include/imex/Dialect/LLVMIR/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

include/imex/Dialect/LLVMIR/XeVMDialect.h

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)