Skip to content

Commit 5878f60

Browse files
[Target] Make key=arm_cpu --> key=arm_cpu,cpu on AArch64 (#13775)
* arm cpu is cpu * init commit * fix test
1 parent bd3d93b commit 5878f60

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/target/parsers/aprofile.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,17 @@ static TargetFeatures GetFeatures(TargetJSON target) {
134134
}
135135

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

139139
if (!existing_keys) {
140-
return {kExtraKey};
140+
return kExtraKeys;
141141
}
142142

143143
Array<String> keys = existing_keys.value();
144-
if (std::find(keys.begin(), keys.end(), kExtraKey) == keys.end()) {
145-
keys.push_back(kExtraKey);
144+
for (String key : kExtraKeys) {
145+
if (std::find(keys.begin(), keys.end(), key) == keys.end()) {
146+
keys.push_back(key);
147+
}
146148
}
147149
return keys;
148150
}

tests/cpp/target/parsers/aprofile_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ static TargetFeatures ParseTargetWithAttrs(String mcpu, String mtriple, Array<St
4848
TEST(AProfileParser, ParseTargetKeys) {
4949
TargetJSON target = ParseTarget({});
5050
Array<String> keys = Downcast<Array<String>>(target.at("keys"));
51-
ASSERT_EQ(keys.size(), 1);
51+
ASSERT_EQ(keys.size(), 2);
5252
ASSERT_EQ(keys[0], "arm_cpu");
53+
ASSERT_EQ(keys[1], "cpu");
5354
}
5455

5556
TEST(AProfileParser, ParseTargetWithExistingKeys) {

0 commit comments

Comments
 (0)