Skip to content

[Clang][NFC] Move OffloadArch enum to a generic location #137070

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

Merged
merged 5 commits into from
Apr 25, 2025
Merged

[Clang][NFC] Move OffloadArch enum to a generic location #137070

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
924f542
[Clang] Move OffloadArch enum to a generic location and add initial s…
jzc Apr 14, 2025
91b7c9d
Address review comments
jzc Apr 24, 2025
d43ae13
Update naming
jzc Apr 24, 2025
9c36e30
Use llvm instead of std
jzc Apr 24, 2025
bd5e7a2
Remove SM2 macro
jzc Apr 24, 2025
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
38 changes: 19 additions & 19 deletions clang/lib/Basic/OffloadArch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ namespace clang {

namespace {
struct OffloadArchToStringMap {
OffloadArch arch;
const char *arch_name;
const char *virtual_arch_name;
OffloadArch Arch;
const char *ArchName;
const char *VirtualArchName;
};
} // namespace

#define SM2(sm, ca) {OffloadArch::SM_##sm, "sm_" #sm, ca}
Copy link
Contributor

@shiltian shiltian Apr 24, 2025

Choose a reason for hiding this comment

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

I'd just define the special sm_20 w/o using this macro

Copy link
Contributor Author

@jzc jzc Apr 24, 2025

Choose a reason for hiding this comment

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

Good point, that is simpler - bd5e7a2

#define SM(sm) SM2(sm, "compute_" #sm)
#define GFX(gpu) {OffloadArch::GFX##gpu, "gfx" #gpu, "compute_amdgcn"}
static const OffloadArchToStringMap arch_names[] = {
static const OffloadArchToStringMap ArchNames[] = {
// clang-format off
{OffloadArch::UNUSED, "", ""},
SM2(20, "compute_20"), SM2(21, "compute_20"), // Fermi
Expand Down Expand Up @@ -97,30 +97,30 @@ static const OffloadArchToStringMap arch_names[] = {
#undef GFX

const char *OffloadArchToString(OffloadArch A) {
auto result = std::find_if(
std::begin(arch_names), std::end(arch_names),
[A](const OffloadArchToStringMap &map) { return A == map.arch; });
if (result == std::end(arch_names))
auto Result = std::find_if(
std::begin(ArchNames), std::end(ArchNames),
[A](const OffloadArchToStringMap &Map) { return A == Map.Arch; });
if (Result == std::end(ArchNames))
return "unknown";
return result->arch_name;
return Result->ArchName;
}

const char *OffloadArchToVirtualArchString(OffloadArch A) {
auto result = std::find_if(
std::begin(arch_names), std::end(arch_names),
[A](const OffloadArchToStringMap &map) { return A == map.arch; });
if (result == std::end(arch_names))
auto Result = std::find_if(
std::begin(ArchNames), std::end(ArchNames),
[A](const OffloadArchToStringMap &Map) { return A == Map.Arch; });
if (Result == std::end(ArchNames))
return "unknown";
return result->virtual_arch_name;
return Result->VirtualArchName;
}

OffloadArch StringToOffloadArch(llvm::StringRef S) {
auto result = std::find_if(
std::begin(arch_names), std::end(arch_names),
[S](const OffloadArchToStringMap &map) { return S == map.arch_name; });
if (result == std::end(arch_names))
auto Result = std::find_if(
std::begin(ArchNames), std::end(ArchNames),
[S](const OffloadArchToStringMap &Map) { return S == Map.ArchName; });
if (Result == std::end(ArchNames))
return OffloadArch::UNKNOWN;
return result->arch;
return Result->Arch;
}

} // namespace clang
Loading