Skip to content

Commit

Permalink
[TARGET] each option of target str should only contain one '=' (apach…
Browse files Browse the repository at this point in the history
…e#5988)

src/target/target_id.cc ParseAttrsFromRawString L222:
if ((pos = FindUniqueSubstr(s, "=")) != -1)
require option contains only one '='

Signed-off-by: windclarion <windclarion@gmail.com>
  • Loading branch information
windclarion authored and trevor-m committed Jul 14, 2020
1 parent b572aa1 commit abeed7b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
20 changes: 10 additions & 10 deletions python/tvm/target/target.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,16 +180,16 @@ def arm_cpu(model='unknown', options=None):
Additional options
"""
trans_table = {
"pixel2": ["-model=snapdragon835", "-mtriple=arm64-linux-android -mattr=+neon"],
"mate10": ["-model=kirin970", "-mtriple=arm64-linux-android -mattr=+neon"],
"mate10pro": ["-model=kirin970", "-mtriple=arm64-linux-android -mattr=+neon"],
"p20": ["-model=kirin970", "-mtriple=arm64-linux-android -mattr=+neon"],
"p20pro": ["-model=kirin970", "-mtriple=arm64-linux-android -mattr=+neon"],
"rasp3b": ["-model=bcm2837", "-mtriple=armv7l-linux-gnueabihf -mattr=+neon"],
"rasp4b": ["-model=bcm2711", "-mtriple=arm-linux-gnueabihf -mattr=+neon"],
"rk3399": ["-model=rk3399", "-mtriple=aarch64-linux-gnu -mattr=+neon"],
"pynq": ["-model=pynq", "-mtriple=armv7a-linux-eabi -mattr=+neon"],
"ultra96": ["-model=ultra96", "-mtriple=aarch64-linux-gnu -mattr=+neon"],
"pixel2": ["-model=snapdragon835", "-mtriple=arm64-linux-android", "-mattr=+neon"],
"mate10": ["-model=kirin970", "-mtriple=arm64-linux-android", "-mattr=+neon"],
"mate10pro": ["-model=kirin970", "-mtriple=arm64-linux-android", "-mattr=+neon"],
"p20": ["-model=kirin970", "-mtriple=arm64-linux-android", "-mattr=+neon"],
"p20pro": ["-model=kirin970", "-mtriple=arm64-linux-android", "-mattr=+neon"],
"rasp3b": ["-model=bcm2837", "-mtriple=armv7l-linux-gnueabihf", "-mattr=+neon"],
"rasp4b": ["-model=bcm2711", "-mtriple=arm-linux-gnueabihf", "-mattr=+neon"],
"rk3399": ["-model=rk3399", "-mtriple=aarch64-linux-gnu", "-mattr=+neon"],
"pynq": ["-model=pynq", "-mtriple=armv7a-linux-eabi", "-mattr=+neon"],
"ultra96": ["-model=ultra96", "-mtriple=aarch64-linux-gnu", "-mattr=+neon"],
}
pre_defined_opt = trans_table.get(model, ["-model=%s" % model])

Expand Down
9 changes: 9 additions & 0 deletions tests/python/unittest/test_target_target.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# under the License.
import tvm
from tvm import te
from tvm.target import cuda, rocm, mali, intel_graphics, arm_cpu, vta, bifrost, hexagon

@tvm.target.generic_func
def mygeneric(data):
Expand Down Expand Up @@ -67,6 +68,14 @@ def test_target_string_parse():
assert tvm.target.mali().device_name == "mali"
assert tvm.target.arm_cpu().device_name == "arm_cpu"


def test_target_create():
targets = [cuda(), rocm(), mali(), intel_graphics(), arm_cpu('rk3399'), vta(), bifrost()]
for tgt in targets:
assert tgt is not None


if __name__ == "__main__":
test_target_dispatch()
test_target_string_parse()
test_target_create()

0 comments on commit abeed7b

Please sign in to comment.