Skip to content

[Target] Only append default keys if target doesn't have any yet #12474

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
Aug 18, 2022
Merged

[Target] Only append default keys if target doesn't have any yet #12474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93ab17e
[Target] Only append default keys if target doesn't have any yet
Aug 17, 2022
c03d069
Add "cpu" to ARM CPU keys
Aug 17, 2022
c9456f6
Add "cpu" to the keys in the mprofile target parser
Aug 17, 2022
53c0271
Restore the mprofile cpptest, since the "cpu" key is back
Aug 17, 2022
6f5c1b1
So the -device attribute is actually needed...
Aug 17, 2022
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
11 changes: 7 additions & 4 deletions src/target/target.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,8 @@ ObjectPtr<Object> TargetInternal::FromConfig(Map<String, ObjectRef> config) {
// parse "keys"
{
std::vector<String> keys;
if (config.count(kKeys)) {
bool has_user_keys = config.count(kKeys);
if (has_user_keys) {
// user provided keys
if (const auto* cfg_keys = config[kKeys].as<ArrayNode>()) {
for (const ObjectRef& e : *cfg_keys) {
Expand All @@ -909,9 +910,11 @@ ObjectPtr<Object> TargetInternal::FromConfig(Map<String, ObjectRef> config) {
keys.push_back(GetRef<String>(device));
}
}
// add default keys
for (const auto& key : target->kind->default_keys) {
keys.push_back(key);
if (!has_user_keys) {
// add default keys
for (const auto& key : target->kind->default_keys) {
keys.push_back(key);
}
}
// de-duplicate keys
target->keys = DeduplicateKeys(keys);
Expand Down
3 changes: 1 addition & 2 deletions tests/cpp/target_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,8 @@ TEST(TargetCreationFail, TargetKindNotFound) {
TEST(TargetCreation, TargetParser) {
Target test_target("TestTargetParser -mcpu=woof");
ASSERT_EQ(test_target->GetAttr<String>("mcpu").value(), "super_woof");
ASSERT_EQ(test_target->keys.size(), 2);
ASSERT_EQ(test_target->keys.size(), 1);
ASSERT_EQ(test_target->keys[0], "super");
ASSERT_EQ(test_target->keys[1], "cpu");
}

TEST(TargetCreation, TargetFeatures) {
Expand Down