Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b5de776fd38d9e42cb217b67d26a3bf10a3d9281
Merge: 26378c55 40b244c
Author: nbpatel <[email protected]>
Date:   Mon Aug 12 22:53:23 2024 +0000

    Merge branch 'main' into llvm_pulldown

commit 26378c552921600924dfeb35917068284a46e8c5
Author: nbpatel <[email protected]>
Date:   Mon Aug 12 19:13:13 2024 +0000

    Clean up

commit f1f3451ffab24ddfa034107b7ac905e554a7da6c
Author: nbpatel <[email protected]>
Date:   Mon Aug 12 18:34:49 2024 +0000

    Enable load2d_dpas_store2d_with_intrinsic

commit d66a56f121252b1ec86d395a266500d809a2684e
Author: nbpatel <[email protected]>
Date:   Mon Aug 12 18:04:27 2024 +0000

    Add comments and clean up

commit 4a0a0e085f77208eeed719a3941524cb6af7070f
Author: nbpatel <[email protected]>
Date:   Fri Aug 9 16:47:11 2024 +0000

    disable some test

commit 58f75023aa48fe57586e8f44b0226d9a53e7cac9
Author: nbpatel <[email protected]>
Date:   Fri Aug 9 16:37:52 2024 +0000

    Fix Vector linearize test case

commit 454d71a435f44b6818e2d076cffad7314bab0336
Author: nbpatel <[email protected]>
Date:   Fri Aug 9 06:16:07 2024 +0000

    Add result type to vector.interleave

commit fe012ed70780f14e4c944e526ef54dcb2ccdc5f7
Author: nbpatel <[email protected]>
Date:   Fri Aug 9 06:08:58 2024 +0000

    Fix CHECK

commit 5d484e9b6fc2dff76907c1025d1083ded6943279
Merge: 98ebecca 8d7255c
Author: nbpatel <[email protected]>
Date:   Thu Aug 8 22:50:37 2024 +0000

    Merge branch 'main' into llvm_pulldown

commit 98ebeccada5f246296118966a1e4ccf4bf2d082a
Author: nbpatel <[email protected]>
Date:   Thu Aug 8 22:43:40 2024 +0000

    Fix XeGPU dialect test

commit c922fc5a5b1301382dd3b881c82a340abaabbebe
Author: nbpatel <[email protected]>
Date:   Thu Aug 8 22:15:23 2024 +0000

    Disable PlaidML tests

commit f1742998cc2c48b8fb0ca69244f3bfd8f7447f67
Author: nbpatel <[email protected]>
Date:   Thu Aug 8 22:03:50 2024 +0000

    Fix XeGPU Dialect test failure

commit cb59d63eaaa7e82f131722939420b9537627bb10
Author: nbpatel <[email protected]>
Date:   Thu Aug 8 17:40:03 2024 +0000

    Reorganize  patches

commit b598ac36d708997f8e869572aaafe9f6c7db1fae
Author: nbpatel <[email protected]>
Date:   Thu Aug 8 16:29:12 2024 +0000

    Fix for test failures

commit b6c6cc614ebfb7dde71652f11a4cbe710ba6bec6
Author: nbpatel <[email protected]>
Date:   Mon Aug 5 19:00:49 2024 +0000

    Clean up patches & update llvm to 08/05/2024

commit 8ebedd30cb070eed251aa5a2f9e433818f25601e
Merge: 7687bfd9 e12b45fb
Author: nbpatel <[email protected]>
Date:   Mon Aug 5 18:58:46 2024 +0000

    Merge branch 'temporary-patch' into llvm_pulldown

commit 7687bfd9c01a40e296bf9b2a9a3f6541cb90c5ed
Merge: c016ed13 febfad2
Author: nbpatel <[email protected]>
Date:   Mon Aug 5 18:58:25 2024 +0000

    Merge branch 'main' into llvm_pulldown

commit e12b45fbdf91a1a24fb7a84bce4a654db3e206d2
Author: Chao Chen <[email protected]>
Date:   Fri Jul 26 16:51:38 2024 +0000

    a temporary patch needed after pulldown

commit c016ed132428fdfe676f044e6dea6e6b576e3bde
Author: Garra1980 <[email protected]>
Date:   Wed Jul 24 23:17:12 2024 +0200

    Adjust subgroupid builder

commit 08601597541d0c79f4e71035f90cf389d4cd6a80
Author: Garra1980 <[email protected]>
Date:   Wed Jul 24 20:40:01 2024 +0200

    Use Blocks instead regions

commit 310fcb7d91cd24a72bda0522ebff24698e74e487
Author: Mei, Yijie <[email protected]>
Date:   Fri Jul 5 04:06:39 2024 +0000

    fix

commit c39c99543bb8a57bea562733fd079cf763232110
Author: Mei, Yijie <[email protected]>
Date:   Thu Jul 4 08:43:35 2024 +0000

    lower ok

commit ba299eed5059d88ba1196c0832cb14d3ab7f8f16
Author: Mei, Yijie <[email protected]>
Date:   Thu Jul 4 06:32:11 2024 +0000

    stash

commit dfcc2b659d7cf44a2d10759389e9d8fceeb8e332
Author: Mei, Yijie <[email protected]>
Date:   Thu Jul 4 06:16:35 2024 +0000

    fix pass

commit 965a7287068bae7ba163c9827417bbd2e6217a5e
Author: Mei, Yijie <[email protected]>
Date:   Wed Jul 3 09:28:53 2024 +0000

    lower
  • Loading branch information
nbpatel committed Aug 12, 2024
1 parent 40b244c commit a5e4256
Show file tree
Hide file tree
Showing 55 changed files with 291 additions and 987 deletions.
2 changes: 1 addition & 1 deletion build_tools/llvm_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1728a56d0e66c9e64a2e62fa6c5508580ccd28a0
08a61eb01172054fc5f8c78ff527f01d9768569b
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
From 1994f9d400c5d768636a89ecf0f78b83431ce609 Mon Sep 17 00:00:00 2001
From: Md Abdullah Shahneous Bari <[email protected]>
Date: Fri, 26 Apr 2024 20:33:41 +0000
Subject: [PATCH 4/7] Add serialization and de-serialization support for
several decorations.

Added decorations:
- Alignment
- DescriptorSet
- FuncParamIOKindINTEL
- SingleElementVectorINTEL
- VectorComputeCallableFunctionINTEL
- VectorComputeFunctionINTEL
- VectorComputeVariableINTEL
---
mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp | 8 +++++++-
mlir/lib/Target/SPIRV/Serialization/Serializer.cpp | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
index cfe3121bbe95..bc0ca11f4e16 100644
index 12980879b20a..b5fbe8c5ceb8 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
+++ b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
@@ -251,8 +251,9 @@ LogicalResult spirv::Deserializer::processDecoration(ArrayRef<uint32_t> words) {
symbol, FPFastMathModeAttr::get(opBuilder.getContext(),
static_cast<FPFastMathMode>(words[2])));
@@ -259,8 +259,9 @@ LogicalResult spirv::Deserializer::processDecoration(ArrayRef<uint32_t> words) {
symbol, FPRoundingModeAttr::get(opBuilder.getContext(),
static_cast<FPRoundingMode>(words[2])));
break;
- case spirv::Decoration::DescriptorSet:
+ case spirv::Decoration::Alignment:
Expand All @@ -32,7 +13,7 @@ index cfe3121bbe95..bc0ca11f4e16 100644
if (words.size() != 3) {
return emitError(unknownLoc, "OpDecorate with ")
<< decorationName << " needs a single integer literal";
@@ -312,6 +313,10 @@ LogicalResult spirv::Deserializer::processDecoration(ArrayRef<uint32_t> words) {
@@ -319,6 +320,10 @@ LogicalResult spirv::Deserializer::processDecoration(ArrayRef<uint32_t> words) {
case spirv::Decoration::Restrict:
case spirv::Decoration::RestrictPointer:
case spirv::Decoration::NoContraction:
Expand All @@ -43,7 +24,7 @@ index cfe3121bbe95..bc0ca11f4e16 100644
if (words.size() != 2) {
return emitError(unknownLoc, "OpDecoration with ")
<< decorationName << "needs a single target <id>";
@@ -322,6 +327,7 @@ LogicalResult spirv::Deserializer::processDecoration(ArrayRef<uint32_t> words) {
@@ -329,6 +334,7 @@ LogicalResult spirv::Deserializer::processDecoration(ArrayRef<uint32_t> words) {
// it is needed for many validation rules.
decorations[words[0]].set(symbol, opBuilder.getUnitAttr());
break;
Expand All @@ -52,12 +33,12 @@ index cfe3121bbe95..bc0ca11f4e16 100644
case spirv::Decoration::SpecId:
if (words.size() != 3) {
diff --git a/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp b/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
index a7d195d7fcb0..34427458d6c1 100644
index 714a3edfb565..bb3c68530aa9 100644
--- a/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
+++ b/mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
@@ -243,8 +243,10 @@ LogicalResult Serializer::processDecorationAttr(Location loc, uint32_t resultID,
@@ -252,8 +252,10 @@ LogicalResult Serializer::processDecorationAttr(Location loc, uint32_t resultID,
}
return emitError(loc, "expected FPFastMathModeAttr attribute for ")
return emitError(loc, "expected FPRoundingModeAttr attribute for ")
<< stringifyDecoration(decoration);
+ case spirv::Decoration::Alignment:
case spirv::Decoration::Binding:
Expand All @@ -66,7 +47,7 @@ index a7d195d7fcb0..34427458d6c1 100644
case spirv::Decoration::Location:
if (auto intAttr = dyn_cast<IntegerAttr>(attr)) {
args.push_back(intAttr.getValue().getZExtValue());
@@ -278,6 +280,10 @@ LogicalResult Serializer::processDecorationAttr(Location loc, uint32_t resultID,
@@ -286,6 +288,10 @@ LogicalResult Serializer::processDecorationAttr(Location loc, uint32_t resultID,
case spirv::Decoration::Restrict:
case spirv::Decoration::RestrictPointer:
case spirv::Decoration::NoContraction:
Expand All @@ -77,5 +58,3 @@ index a7d195d7fcb0..34427458d6c1 100644
// For unit attributes and decoration attributes, the args list
// has no values so we do nothing.
if (isa<UnitAttr, DecorationAttr>(attr))
--
2.34.1

This file was deleted.

This file was deleted.

Loading

0 comments on commit a5e4256

Please sign in to comment.