From 25d6fddf0180c1d306d0a60ceab751e69aa01ff5 Mon Sep 17 00:00:00 2001
From: Hamza Khallouki <hamza.khallouki@amd.com>
Date: Thu, 23 Jan 2025 14:00:39 +0000
Subject: [PATCH] fixup! [AIE2P] Add fifo store intrinsics - IR lowering

---
 clang/include/clang/Basic/BuiltinsAIE2P.def | 4 ++--
 clang/lib/CodeGen/CGBuiltin.cpp             | 2 +-
 clang/lib/Headers/aie2p_ldst.h              | 4 +---
 clang/test/CodeGen/aie/aie2p/aie2p-ldst.cpp | 2 +-
 llvm/include/llvm/IR/IntrinsicsAIE2P.td     | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/clang/include/clang/Basic/BuiltinsAIE2P.def b/clang/include/clang/Basic/BuiltinsAIE2P.def
index 5d788e821a93..beae019623bd 100644
--- a/clang/include/clang/Basic/BuiltinsAIE2P.def
+++ b/clang/include/clang/Basic/BuiltinsAIE2P.def
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
+// (c) Copyright 2024-2025 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
 //
@@ -332,4 +332,4 @@ BUILTIN(__builtin_aie2p_fifo_st_flush_3d_byte, "vi*&V32i&i&iii&iii&i", "nc")
 BUILTIN(__builtin_aie2p_fifo_st_flush_conv, "vi*&V32i&i&", "nc")
 BUILTIN(__builtin_aie2p_fifo_st_flush_conv_1d_byte, "vi*&V32i&i&i", "nc")
 BUILTIN(__builtin_aie2p_fifo_st_flush_conv_2d_byte, "vi*&V32i&i&iii&i", "nc")
-BUILTIN(__builtin_aie2p_fifo_st_flush_conv_3d_byte, "vi*&V32i&i&iii&iii&i", "nc")
\ No newline at end of file
+BUILTIN(__builtin_aie2p_fifo_st_flush_conv_3d_byte, "vi*&V32i&i&iii&iii&i", "nc")
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index c31c3b95852e..f1abe7a3726c 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// Modifications (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its
+// Modifications (c) Copyright 2023-2025 Advanced Micro Devices, Inc. or its
 // affiliates
 //
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/Headers/aie2p_ldst.h b/clang/lib/Headers/aie2p_ldst.h
index 3ae3f268df25..1da8cc6499d4 100644
--- a/clang/lib/Headers/aie2p_ldst.h
+++ b/clang/lib/Headers/aie2p_ldst.h
@@ -1,11 +1,9 @@
-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
-// UTC_ARGS: --version 4
 //===-------------------- AIEngine AIE2p intrinsics ------------------------===
 // This file is licensed under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
+// (c) Copyright 2024-2025 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/clang/test/CodeGen/aie/aie2p/aie2p-ldst.cpp b/clang/test/CodeGen/aie/aie2p/aie2p-ldst.cpp
index 604f24f6cb2a..33cca502cd71 100644
--- a/clang/test/CodeGen/aie/aie2p/aie2p-ldst.cpp
+++ b/clang/test/CodeGen/aie/aie2p/aie2p-ldst.cpp
@@ -5,7 +5,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
+// (c) Copyright 2024-2025 Advanced Micro Devices, Inc. or its affiliates
 //
 //===----------------------------------------------------------------------===//
 // RUN: %clang -O2 %s --target=aie2p -nostdlibinc -S -emit-llvm -o - | FileCheck %s
diff --git a/llvm/include/llvm/IR/IntrinsicsAIE2P.td b/llvm/include/llvm/IR/IntrinsicsAIE2P.td
index 358006b62a87..87aa456ad470 100644
--- a/llvm/include/llvm/IR/IntrinsicsAIE2P.td
+++ b/llvm/include/llvm/IR/IntrinsicsAIE2P.td
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// (c) Copyright 2024 Advanced Micro Devices, Inc. or its affiliates
+// (c) Copyright 2024-2025 Advanced Micro Devices, Inc. or its affiliates
 //===----------------------------------------------------------------------===//
 //
 // This file defines all of the AIE2P-specific intrinsics.