Skip to content

[DRAFT] [AIEX] simplify Debug types across AIE architectures #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: aie-public
Choose a base branch
from
Draft

[DRAFT] [AIEX] simplify Debug types across AIE architectures #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/Target/AIE/AIE2InstructionSelector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <optional>
#include <utility>

#define DEBUG_TYPE "aie2-isel"
#define DEBUG_TYPE "aie-isel"

using namespace llvm;
using namespace MIPatternMatch;
Expand Down
7 changes: 4 additions & 3 deletions llvm/lib/Target/AIE/AIE2PostLegalizerCustomCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===----------------------------------------------------------------------===//
//
Expand All @@ -25,7 +25,7 @@
#include "llvm/CodeGen/MachineDominators.h"
#include "llvm/InitializePasses.h"

#define DEBUG_TYPE "aie2-postlegalizer-custom-combiner"
Copy link
Collaborator

@andcarminati andcarminati Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this problematic because we use this as the pass name. If we decouple the debug from the pass name it could be fine.

Copy link
Collaborator

@andcarminati andcarminati Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See INITIALIZE_PASS_BEGIN. We register two passes with the same name.

Copy link
Collaborator Author

@F-Stuckmann F-Stuckmann Oct 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, but i also don't like a different pass name and a different debug type.

#define DEBUG_TYPE "postlegalizer-custom-combiner"
Copy link
Collaborator

@niwinanto niwinanto Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to retain the aie keyword


#define GET_GICOMBINER_DEPS
#include "AIE2GenPostLegalizerGICustomCombiner.inc"
Expand Down Expand Up @@ -154,7 +154,8 @@ bool AIE2PostLegalizerCustomCombiner::runOnMachineFunction(
const auto *LI = ST.getLegalizerInfo();

GISelKnownBits *KB = &getAnalysis<GISelKnownBitsAnalysis>().get(MF);
MachineDominatorTree *MDT = &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
MachineDominatorTree *MDT =
&getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();

AIE::FoundCombiners *AIEGlobalPtrIncResults = nullptr;
if (auto *PtrModOptPass = getAnalysisIfAvailable<AIEPtrModOptimizer>())
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/AIE/AIE2PostLegalizerGenericCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===----------------------------------------------------------------------===//
//
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/AIE/AIE2PreLegalizerCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===----------------------------------------------------------------------===//
//
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/AIE/aie2p/AIE2PInstructionSelector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <optional>
#include <utility>

#define DEBUG_TYPE "aie2p-isel"
#define DEBUG_TYPE "aie-isel"

using namespace llvm;

Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerCustomCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===--------------------------------------------------------------------===//
//
Expand All @@ -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"
Expand Down
7 changes: 4 additions & 3 deletions llvm/lib/Target/AIE/aie2p/AIE2PPostLegalizerGenericCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===--------------------------------------------------------------------===//
//
Expand All @@ -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"
Expand Down Expand Up @@ -142,7 +142,8 @@ bool AIE2PPostLegalizerGenericCombiner::runOnMachineFunction(
const auto *LI = ST.getLegalizerInfo();

GISelKnownBits *KB = &getAnalysis<GISelKnownBitsAnalysis>().get(MF);
MachineDominatorTree *MDT = &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
MachineDominatorTree *MDT =
&getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();

CombinerInfo CInfo(/*AllowIllegalOps*/ true, /*ShouldLegalizeIllegal*/ false,
/*LegalizerInfo*/ nullptr, EnableOpt, F.hasOptSize(),
Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/AIE/aie2p/AIE2PPreLegalizerCombiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
//
//===--------------------------------------------------------------------===//
//
Expand All @@ -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"
Expand Down
Loading