diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py index 23533b399b545170237f65f0ec6199a32a2aa091..6fe42dfffa97d14f36c40ccac66caf6a58d20261 100644 --- a/loopy/kernel/creation.py +++ b/loopy/kernel/creation.py @@ -141,7 +141,7 @@ def expand_defines_in_expr(expr, defines): INSN_RE = re.compile( "\s*(?:\<(?P.*?)\>)?" "\s*(?P.+?)\s*(?.+?)" - "\s*?(?:\{(?P[\s\w=,:]+)\}\s*)?$" + "\s*?(?:\{(?P[\s\w_=,:]+)\}\s*)?$" ) SUBST_RE = re.compile( r"^\s*(?P.+?)\s*:=\s*(?P.+)\s*$" @@ -186,6 +186,8 @@ def parse_insn(insn): if opt_key == "id": insn_id = opt_value + elif opt_key == "id_prefix": + insn_id = MakeUnique(opt_value) elif opt_key == "priority": priority = int(opt_value) elif opt_key == "dep":