From 57b1934163f9fdfce691d52691a0d1ace0f3e2e0 Mon Sep 17 00:00:00 2001 From: Fabian Stuckmann Date: Wed, 1 Oct 2025 06:59:47 -0600 Subject: [PATCH] [AIEX] simplify Debug types across aie architectures --- llvm/lib/Target/AIE/AIE2InstructionSelector.cpp | 2 +- llvm/lib/Target/AIE/AIE2PostLegalizerCustomCombiner.cpp | 7 ++++--- llvm/lib/Target/AIE/AIE2PostLegalizerGenericCombiner.cpp | 4 ++-- llvm/lib/Target/AIE/AIE2PreLegalizerCombiner.cpp | 4 ++-- llvm/lib/Target/AIE/aie2p/AIE2PInstructionSelector.cpp | 2 +- .../Target/AIE/aie2p/AIE2PPostLegalizerCustomCombiner.cpp | 4 ++-- .../Target/AIE/aie2p/AIE2PPostLegalizerGenericCombiner.cpp | 7 ++++--- llvm/lib/Target/AIE/aie2p/AIE2PPreLegalizerCombiner.cpp | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/llvm/lib/Target/AIE/AIE2InstructionSelector.cpp b/llvm/lib/Target/AIE/AIE2InstructionSelector.cpp index fac2366a0d44..381bf321c69b 100644 --- a/llvm/lib/Target/AIE/AIE2InstructionSelector.cpp +++ b/llvm/lib/Target/AIE/AIE2InstructionSelector.cpp @@ -26,7 +26,7 @@ #include #include -#define DEBUG_TYPE "aie2-isel" +#define DEBUG_TYPE "aie-isel" using namespace llvm; using namespace MIPatternMatch; diff --git a/llvm/lib/Target/AIE/AIE2PostLegalizerCustomCombiner.cpp b/llvm/lib/Target/AIE/AIE2PostLegalizerCustomCombiner.cpp index 294d1eac4107..eefc00cf3c61 100644 --- a/llvm/lib/Target/AIE/AIE2PostLegalizerCustomCombiner.cpp +++ b/llvm/lib/Target/AIE/AIE2PostLegalizerCustomCombiner.cpp @@ -4,7 +4,7 @@ // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates +// (c) Copyright 2023-2025 Advanced Micro Devices, Inc. or its affiliates // //===----------------------------------------------------------------------===// // @@ -25,7 +25,7 @@ #include "llvm/CodeGen/MachineDominators.h" #include "llvm/InitializePasses.h" -#define DEBUG_TYPE "aie2-postlegalizer-custom-combiner" +#define DEBUG_TYPE "postlegalizer-custom-combiner" #define GET_GICOMBINER_DEPS #include "AIE2GenPostLegalizerGICustomCombiner.inc" @@ -154,7 +154,8 @@ bool AIE2PostLegalizerCustomCombiner::runOnMachineFunction( const auto *LI = ST.getLegalizerInfo(); GISelKnownBits *KB = &getAnalysis().get(MF); - MachineDominatorTree *MDT = &getAnalysis().getDomTree(); + MachineDominatorTree *MDT = + &getAnalysis().getDomTree(); AIE::FoundCombiners *AIEGlobalPtrIncResults = nullptr; if (auto *PtrModOptPass = getAnalysisIfAvailable()) diff --git a/llvm/lib/Target/AIE/AIE2PostLegalizerGenericCombiner.cpp b/llvm/lib/Target/AIE/AIE2PostLegalizerGenericCombiner.cpp index 047eb23bee3f..6e393eca0275 100644 --- a/llvm/lib/Target/AIE/AIE2PostLegalizerGenericCombiner.cpp +++ b/llvm/lib/Target/AIE/AIE2PostLegalizerGenericCombiner.cpp @@ -4,7 +4,7 @@ // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates +// (c) Copyright 2023-2025 Advanced Micro Devices, Inc. or its affiliates // //===----------------------------------------------------------------------===// // @@ -24,7 +24,7 @@ #include "llvm/CodeGen/MachineDominators.h" #include "llvm/InitializePasses.h" -#define DEBUG_TYPE "aie2-postlegalizer-generic-combiner" +#define DEBUG_TYPE "postlegalizer-generic-combiner" #define GET_GICOMBINER_DEPS #include "AIE2GenPostLegalizerGIGenericCombiner.inc" diff --git a/llvm/lib/Target/AIE/AIE2PreLegalizerCombiner.cpp b/llvm/lib/Target/AIE/AIE2PreLegalizerCombiner.cpp index 326994aa3c90..77da05f54f88 100644 --- a/llvm/lib/Target/AIE/AIE2PreLegalizerCombiner.cpp +++ b/llvm/lib/Target/AIE/AIE2PreLegalizerCombiner.cpp @@ -4,7 +4,7 @@ // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// (c) Copyright 2023-2024 Advanced Micro Devices, Inc. or its affiliates +// (c) Copyright 2023-2025 Advanced Micro Devices, Inc. or its affiliates // //===----------------------------------------------------------------------===// // @@ -27,7 +27,7 @@ #include "llvm/IR/IntrinsicsAIE2.h" #include "llvm/InitializePasses.h" -#define DEBUG_TYPE "aie2-prelegalizer-combiner" +#define DEBUG_TYPE "prelegalizer-combiner" #define GET_GICOMBINER_DEPS #include "AIE2GenPreLegalizerGICombiner.inc" diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PInstructionSelector.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PInstructionSelector.cpp index 0a6652773713..d234b98c4313 100644 --- a/llvm/lib/Target/AIE/aie2p/AIE2PInstructionSelector.cpp +++ b/llvm/lib/Target/AIE/aie2p/AIE2PInstructionSelector.cpp @@ -27,7 +27,7 @@ #include #include -#define DEBUG_TYPE "aie2p-isel" +#define DEBUG_TYPE "aie-isel" using namespace llvm; diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerCustomCombiner.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerCustomCombiner.cpp index 88136a8cdbc8..d5743d77bd0f 100644 --- a/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerCustomCombiner.cpp +++ b/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerCustomCombiner.cpp @@ -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 // //===--------------------------------------------------------------------===// // @@ -24,7 +24,7 @@ #include "llvm/CodeGen/MachineDominators.h" #include "llvm/InitializePasses.h" -#define DEBUG_TYPE "aie2p-postlegalizer-custom-combiner" +#define DEBUG_TYPE "postlegalizer-custom-combiner" #define GET_GICOMBINER_DEPS #include "AIE2PGenPostLegalizerGICustomCombiner.inc" diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerGenericCombiner.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerGenericCombiner.cpp index c039a83b1c9b..4b086181a2cf 100644 --- a/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerGenericCombiner.cpp +++ b/llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerGenericCombiner.cpp @@ -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 // //===--------------------------------------------------------------------===// // @@ -24,7 +24,7 @@ #include "llvm/CodeGen/MachineDominators.h" #include "llvm/InitializePasses.h" -#define DEBUG_TYPE "aie2p-postlegalizer-generic-combiner" +#define DEBUG_TYPE "postlegalizer-generic-combiner" #define GET_GICOMBINER_DEPS #include "AIE2PGenPostLegalizerGIGenericCombiner.inc" @@ -142,7 +142,8 @@ bool AIE2PPostLegalizerGenericCombiner::runOnMachineFunction( const auto *LI = ST.getLegalizerInfo(); GISelKnownBits *KB = &getAnalysis().get(MF); - MachineDominatorTree *MDT = &getAnalysis().getDomTree(); + MachineDominatorTree *MDT = + &getAnalysis().getDomTree(); CombinerInfo CInfo(/*AllowIllegalOps*/ true, /*ShouldLegalizeIllegal*/ false, /*LegalizerInfo*/ nullptr, EnableOpt, F.hasOptSize(), diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PPreLegalizerCombiner.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PPreLegalizerCombiner.cpp index d1fa537372a0..337438388bb9 100644 --- a/llvm/lib/Target/AIE/aie2p/AIE2PPreLegalizerCombiner.cpp +++ b/llvm/lib/Target/AIE/aie2p/AIE2PPreLegalizerCombiner.cpp @@ -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 // //===--------------------------------------------------------------------===// // @@ -28,7 +28,7 @@ #include "llvm/IR/IntrinsicsAIE2P.h" #include "llvm/InitializePasses.h" -#define DEBUG_TYPE "aie2p-prelegalizer-combiner" +#define DEBUG_TYPE "prelegalizer-combiner" #define GET_GICOMBINER_DEPS #include "AIE2PGenPreLegalizerGICombiner.inc"