Skip to content

[Target] Make key=arm_cpu --> key=arm_cpu,cpu on AArch64 #13775

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
AndrewZhaoLuo merged 3 commits into from
Jan 13, 2023
Merged

[Target] Make key=arm_cpu --> key=arm_cpu,cpu on AArch64 #13775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e412df
arm cpu is cpu
AndrewZhaoLuo Jan 12, 2023
87b1486
init commit
AndrewZhaoLuo Jan 12, 2023
b69bd22
fix test
AndrewZhaoLuo Jan 12, 2023
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
10 changes: 6 additions & 4 deletions src/target/parsers/aprofile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,17 @@ static TargetFeatures GetFeatures(TargetJSON target) {
}

static Array<String> MergeKeys(Optional<Array<String>> existing_keys) {
const String kExtraKey = "arm_cpu";
const Array<String> kExtraKeys = {"arm_cpu", "cpu"};

if (!existing_keys) {
return {kExtraKey};
return kExtraKeys;
}

Array<String> keys = existing_keys.value();
if (std::find(keys.begin(), keys.end(), kExtraKey) == keys.end()) {
keys.push_back(kExtraKey);
for (String key : kExtraKeys) {
if (std::find(keys.begin(), keys.end(), key) == keys.end()) {
keys.push_back(key);
}
}
return keys;
}
Expand Down
3 changes: 2 additions & 1 deletion tests/cpp/target/parsers/aprofile_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ static TargetFeatures ParseTargetWithAttrs(String mcpu, String mtriple, Array<St
TEST(AProfileParser, ParseTargetKeys) {
TargetJSON target = ParseTarget({});
Array<String> keys = Downcast<Array<String>>(target.at("keys"));
ASSERT_EQ(keys.size(), 1);
ASSERT_EQ(keys.size(), 2);
ASSERT_EQ(keys[0], "arm_cpu");
ASSERT_EQ(keys[1], "cpu");
}

TEST(AProfileParser, ParseTargetWithExistingKeys) {
Expand Down