-
Notifications
You must be signed in to change notification settings - Fork 588
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TargetDescription dynamically generates the "master" target description contents (target.xml), so that we only have to manage the individual concrete CPU features (like foo-sse.xml, for instance). TargetDescription will generate the xml contents that includes the used features. Removed combinatorial target.xml files These are now handled by `TargetDescription` instead. This unblocks the #3776 PR (AVX512 support) from getting pulled in, though that PR will need to take this PR into account.
- Loading branch information
1 parent
3121089
commit f7f4c29
Showing
12 changed files
with
186 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* -*- Mode: C++; tab-width: 8; c-basic-offset: 2; indent-tabs-mode: nil; -*- */ | ||
|
|
||
| #include "TargetDescription.h" | ||
|
|
||
| #include <sstream> | ||
|
|
||
| #include "GdbServerConnection.h" | ||
| #include "kernel_abi.h" | ||
|
|
||
| namespace rr { | ||
|
|
||
| class FeatureStream { | ||
| public: | ||
| string result() { return stream.str(); } | ||
|
|
||
| template <typename Any> | ||
| friend FeatureStream& operator<<(FeatureStream& stream, Any any); | ||
|
|
||
| private: | ||
| stringstream stream; | ||
| const char* arch_prefix; | ||
| }; | ||
|
|
||
| template <typename Any> | ||
| FeatureStream& operator<<(FeatureStream& stream, Any any) { | ||
| stream.stream << any; | ||
| return stream; | ||
| } | ||
|
|
||
| template <> | ||
| FeatureStream& operator<<(FeatureStream& stream, rr::SupportedArch arch) { | ||
| stream << "<architecture>"; | ||
| switch (arch) { | ||
| case rr::x86: | ||
| stream << "i386"; | ||
| stream.arch_prefix = "32bit-"; | ||
| break; | ||
| case rr::x86_64: | ||
| stream << "i386:x86-64"; | ||
| stream.arch_prefix = "64bit-"; | ||
| break; | ||
| case rr::aarch64: | ||
| stream << "aarch64"; | ||
| stream.arch_prefix = "aarch64-"; | ||
| break; | ||
| } | ||
| stream << "</architecture>\n"; | ||
| return stream; | ||
| } | ||
|
|
||
| template <> | ||
| FeatureStream& operator<<(FeatureStream& stream, TargetFeature feature) { | ||
| DEBUG_ASSERT(stream.arch_prefix != nullptr && | ||
| "No architecture has been provided to description"); | ||
| stream << R"( <xi:include href=")" << stream.arch_prefix; | ||
| switch (feature) { | ||
| case TargetFeature::Core: | ||
| stream << "core.xml"; | ||
| break; | ||
| case TargetFeature::Linux: | ||
| stream << "linux.xml"; | ||
| break; | ||
| case TargetFeature::SSE: | ||
| stream << "sse.xml"; | ||
| break; | ||
| case TargetFeature::AVX: | ||
| stream << "avx.xml"; | ||
| break; | ||
| case TargetFeature::PKeys: | ||
| stream << "pkeys.xml"; | ||
| break; | ||
| case TargetFeature::Segment: | ||
| stream << "seg.xml"; | ||
| break; | ||
| case TargetFeature::FPU: | ||
| stream << "fpu.xml"; | ||
| break; | ||
| } | ||
| stream << R"("/>)" << '\n'; | ||
| return stream; | ||
| } | ||
|
|
||
| TargetDescription::TargetDescription(rr::SupportedArch arch, | ||
| uint32_t cpu_features) | ||
| : arch(arch), target_features() { | ||
|
|
||
| // default-assumed registers per arch | ||
| switch (arch) { | ||
| case rr::x86: | ||
| target_features.push_back(TargetFeature::Core); | ||
| target_features.push_back(TargetFeature::SSE); | ||
| target_features.push_back(TargetFeature::Linux); | ||
| break; | ||
| case rr::x86_64: | ||
| target_features.push_back(TargetFeature::Core); | ||
| target_features.push_back(TargetFeature::SSE); | ||
| target_features.push_back(TargetFeature::Linux); | ||
| target_features.push_back(TargetFeature::Segment); | ||
| break; | ||
| case rr::aarch64: | ||
| target_features.push_back(TargetFeature::Core); | ||
| target_features.push_back(TargetFeature::FPU); | ||
| break; | ||
| } | ||
|
|
||
| if (cpu_features & rr::GdbServerConnection::CPU_AVX) { | ||
| DEBUG_ASSERT((arch == rr::x86 || arch == rr::x86_64) && "unexpected arch"); | ||
| target_features.push_back(TargetFeature::AVX); | ||
| } | ||
|
|
||
| if (cpu_features & rr::GdbServerConnection::CPU_PKU) { | ||
| DEBUG_ASSERT((arch == rr::x86 || arch == rr::x86_64) && "unexpected arch"); | ||
| target_features.push_back(TargetFeature::PKeys); | ||
| } | ||
| } | ||
|
|
||
| static const char header[] = R"(<?xml version="1.0"?> | ||
| <!DOCTYPE target SYSTEM "gdb-target.dtd"> | ||
| <target> | ||
| )"; | ||
|
|
||
| string TargetDescription::to_xml() const { | ||
| FeatureStream fs; | ||
| fs << header << arch << "<osabi>GNU/Linux</osabi>\n"; | ||
| for (const auto feature : target_features) { | ||
| fs << feature; | ||
| } | ||
| fs << "</target>"; | ||
|
|
||
| return fs.result(); | ||
| } | ||
| } // namespace rr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* -*- Mode: C++; tab-width: 8; c-basic-offset: 2; indent-tabs-mode: nil; -*- */ | ||
|
|
||
| #ifndef RR_TARGET_DESCRIPTION_H_ | ||
| #define RR_TARGET_DESCRIPTION_H_ | ||
|
|
||
| #include <cstdint> | ||
|
|
||
| #include "kernel_abi.h" | ||
|
|
||
| using namespace std; | ||
|
|
||
| namespace rr { | ||
|
|
||
| enum class TargetFeature : uint32_t { | ||
| Core = 0, | ||
| SSE, | ||
| Linux, | ||
| Segment, | ||
| AVX, | ||
| PKeys, | ||
| FPU, | ||
| }; | ||
|
|
||
| class TargetDescription { | ||
| public: | ||
| explicit TargetDescription(rr::SupportedArch arch, uint32_t cpu_features); | ||
| string to_xml() const; | ||
|
|
||
| private: | ||
| SupportedArch arch; | ||
| vector<TargetFeature> target_features; | ||
| }; | ||
| } // namespace rr | ||
|
|
||
| #endif /* RR_TARGET_DESCRIPTION_H_ */ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.