https://github.com/AdityaSinha149 updated https://github.com/llvm/llvm-project/pull/225049
>From 26051d4eccd7b81656a1206ccf69bcaa8f4909a4 Mon Sep 17 00:00:00 2001 From: AdityaSinha149 <[email protected]> Date: Mon, 21 Sep 2026 14:33:02 +0530 Subject: [PATCH] [NFC][clang][Driver] Move normalizeForBundler to OffloadBundler for reuse --- clang/include/clang/Driver/OffloadBundler.h | 3 +++ clang/lib/Driver/OffloadBundler.cpp | 20 +++++++++++++++++++ clang/lib/Driver/ToolChains/HIPUtility.cpp | 22 +-------------------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/clang/include/clang/Driver/OffloadBundler.h b/clang/include/clang/Driver/OffloadBundler.h index 96839240543af..193584869209d 100644 --- a/clang/include/clang/Driver/OffloadBundler.h +++ b/clang/include/clang/Driver/OffloadBundler.h @@ -96,6 +96,9 @@ struct OffloadTargetInfo { /// <kind>-<triple>[-<target id>[:target features]] /// <triple> := <arch>-<vendor>-<os>-<env> bool checkOffloadBundleID(const llvm::StringRef Str); +/// Constructs the normalized triple string used in an offload bundle entry ID. +std::string normalizeForBundler(const llvm::Triple &OrigT, + llvm::StringRef BoundArch); } // namespace clang #endif // LLVM_CLANG_DRIVER_OFFLOADBUNDLER_H diff --git a/clang/lib/Driver/OffloadBundler.cpp b/clang/lib/Driver/OffloadBundler.cpp index 2d0c326ab6f40..a4ad17905a887 100644 --- a/clang/lib/Driver/OffloadBundler.cpp +++ b/clang/lib/Driver/OffloadBundler.cpp @@ -1752,3 +1752,23 @@ bool clang::checkOffloadBundleID(const llvm::StringRef Str) { Str.split(Components, '-', /*MaxSplit=*/5); return Components.size() == 5 || Components.size() == 6; } + +std::string clang::normalizeForBundler(const llvm::Triple &OrigT, + StringRef BoundArch) { + llvm::Triple T(OrigT); + bool HasTargetID = !BoundArch.empty(); + + // FIXME: Short-term hack. The HIP runtime hardcodes the legacy + // "amdgcn-amd-amdhsa--" prefix when parsing the target IDs embedded in the + // fatbin bundle, so force it. + if (HasTargetID && T.isAMDGCN()) { + return ("amdgcn-" + T.getVendorName() + "-" + T.getOSName() + "-" + + T.getEnvironmentName()) + .str(); + } + + return HasTargetID ? (T.getArchName() + "-" + T.getVendorName() + "-" + + T.getOSName() + "-" + T.getEnvironmentName()) + .str() + : T.normalize(llvm::Triple::CanonicalForm::FOUR_IDENT); +} diff --git a/clang/lib/Driver/ToolChains/HIPUtility.cpp b/clang/lib/Driver/ToolChains/HIPUtility.cpp index 34a35e18c2e12..4fad72bab15bf 100644 --- a/clang/lib/Driver/ToolChains/HIPUtility.cpp +++ b/clang/lib/Driver/ToolChains/HIPUtility.cpp @@ -9,6 +9,7 @@ #include "HIPUtility.h" #include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" +#include "clang/Driver/OffloadBundler.h" #include "clang/Options/Options.h" #include "llvm/Support/Path.h" @@ -27,27 +28,6 @@ namespace { const unsigned HIPCodeObjectAlign = 4096; } // namespace -// Constructs a triple string for clang offload bundler. -static std::string normalizeForBundler(const llvm::Triple &OrigT, - StringRef BoundArch) { - llvm::Triple T(OrigT); - bool HasTargetID = !BoundArch.empty(); - - // FIXME: Short-term hack. The HIP runtime hardcodes the legacy - // "amdgcn-amd-amdhsa--" prefix when parsing the target IDs embedded in the - // fatbin bundle, so force it. - if (HasTargetID && T.isAMDGCN()) { - return ("amdgcn-" + T.getVendorName() + "-" + T.getOSName() + "-" + - T.getEnvironmentName()) - .str(); - } - - return HasTargetID ? (T.getArchName() + "-" + T.getVendorName() + "-" + - T.getOSName() + "-" + T.getEnvironmentName()) - .str() - : T.normalize(llvm::Triple::CanonicalForm::FOUR_IDENT); -} - // Construct a clang-offload-bundler command to bundle code objects for // different devices into a HIP fat binary. void HIP::constructHIPFatbinCommand(Compilation &C, const JobAction &JA, _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
