From b69dbdd46c1d48109f4942d6fedf39da543ebba0 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Jian Date: Thu, 6 Jun 2024 16:17:48 +0800 Subject: [PATCH 1/5] [NFC] fix C0301: line too long Signed-off-by: Jerry Zhang Jian --- rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py b/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py index 8efd5b1ed..6d7b68695 100644 --- a/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py +++ b/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py @@ -518,7 +518,8 @@ def func(self, inst_info, name, return_type, **kwargs): os.path.join(self.folder, test_file_name), mode, encoding="utf-8") stripped_prefix_non_overloaded_func_name = non_overloaded_func_name[8:] - non_overloaded_func_name = "test_" + stripped_prefix_non_overloaded_func_name + non_overloaded_func_name = "test_" + \ + stripped_prefix_non_overloaded_func_name self.generated_functions_set.add(non_overloaded_func_name) args = ", ".join(map(lambda a: f"{a[1]} {a[0]}", kwargs.items())) # "T * name" to "T *name" From f2975a5eee38168a38b6271715772eb582878ef4 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Jian Date: Thu, 6 Jun 2024 16:18:41 +0800 Subject: [PATCH 2/5] [NFC] fix C0325: Unnecessary parens after '=' Signed-off-by: Jerry Zhang Jian --- .../rvv_intrinsic_gen/generator.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py b/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py index 6d7b68695..0b8a5df35 100644 --- a/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py +++ b/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py @@ -446,27 +446,27 @@ def __init__(self, f, is_overloaded, toolchain_type, has_tail_policy): def write_file_header(self, has_float_type, has_bfloat16_type): #pylint: disable=line-too-long - int_llvm_header = (r"""// REQUIRES: riscv-registered-target + int_llvm_header = r"""// REQUIRES: riscv-registered-target // RUN: %clang_cc1 -triple riscv64 -target-feature +v -disable-O0-optnone \ // RUN: -emit-llvm %s -o - | opt -S -passes=mem2reg | \ // RUN: FileCheck --check-prefix=CHECK-RV64 %s -""") - float_llvm_header = (r"""// REQUIRES: riscv-registered-target +""" + float_llvm_header = r"""// REQUIRES: riscv-registered-target // RUN: %clang_cc1 -triple riscv64 -target-feature +v -target-feature +zfh \ // RUN: -target-feature +experimental-zvfh -disable-O0-optnone \ // RUN: -emit-llvm %s -o - | opt -S -passes=mem2reg | \ // RUN: FileCheck --check-prefix=CHECK-RV64 %s -""") - bfloat16_llvm_header = (r"""// REQUIRES: riscv-registered-target +""" + bfloat16_llvm_header = r"""// REQUIRES: riscv-registered-target // RUN: %clang_cc1 -triple riscv64 -target-feature +v \ // RUN: -target-feature +experimental-zvfbfmin \ // RUN: -target-feature +experimental-zvfbfwma -disable-O0-optnone \ // RUN: -emit-llvm %s -o - | opt -S -passes=mem2reg | \ // RUN: FileCheck --check-prefix=CHECK-RV64 %s -""") +""" gnu_header = ( r"""/* { dg-do compile } */ /* { dg-options """ + '"' + "-march=rv64gcv_zvfh -mabi=lp64d" + From fdbaf2e27f08630e0e3977b49a26130bfc5ffe36 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Jian Date: Thu, 6 Jun 2024 16:19:30 +0800 Subject: [PATCH 3/5] [NFC] fix W0613: Unused argument Signed-off-by: Jerry Zhang Jian --- .../rvv_intrinsic_gen/generator.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py b/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py index 0b8a5df35..46d0e23a2 100644 --- a/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py +++ b/rvv-intrinsic-generator/rvv_intrinsic_gen/generator.py @@ -37,19 +37,19 @@ def __init__(self): pass def write(self, text): - return NotImplemented + raise NotImplementedError def write_title(self, text, link): - return NotImplemented + raise NotImplementedError def gen_prologue(self): - return NotImplemented + raise NotImplementedError def inst_group_prologue(self): - return NotImplemented + raise NotImplementedError def inst_group_epilogue(self): - return NotImplemented + raise NotImplementedError @abstractmethod def func(self, inst_info, name, return_type, **kwargs): @@ -69,7 +69,7 @@ def function_group(self, template, title, link, op_list, type_list, sew_list, decorator_list=decorator_list) def start_group(self, group_name): - return NotImplemented + raise NotImplementedError @staticmethod def func_name(name): @@ -291,7 +291,7 @@ def report_summary(self): \x1b[0mfunctions") def post_gen(self): - return NotImplemented + raise NotImplementedError class DocGenerator(Generator): From 8e6de5f28815ad5a5f46a72d5bc673317c2f24b8 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Jian Date: Thu, 6 Jun 2024 16:26:26 +0800 Subject: [PATCH 4/5] [NFC] fix E0606: Possibly using variable 's_op2' before assignment Signed-off-by: Jerry Zhang Jian --- .../rvv_intrinsic_gen/templates/binary_op_template.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/binary_op_template.py b/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/binary_op_template.py index 2232609b6..fa2223ada 100644 --- a/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/binary_op_template.py +++ b/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/binary_op_template.py @@ -61,6 +61,7 @@ def render(G, op_list, type_list, sew_list, lmul_list, decorator_list): type_helper = TypeHelper(**args) + s_op2 = None if (op in ["mulhsu", "ssra", "sra"] and data_type == "uint") or \ (op in ["ssrl", "srl"] and data_type == "int"): # Unsigned mulhsu and ssra are unsupported, signed ssrl is unsupported From 86aa9497f467a18ae5036c4664a7b8eed0108a49 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Jian Date: Thu, 6 Jun 2024 16:26:51 +0800 Subject: [PATCH 5/5] [NFC] fix E0606: Possibly using variable 'inst_type' before assignment Signed-off-by: Jerry Zhang Jian --- .../rvv_intrinsic_gen/templates/misc_op_template.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/misc_op_template.py b/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/misc_op_template.py index 95b9a29ec..43b757b79 100644 --- a/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/misc_op_template.py +++ b/rvv-intrinsic-generator/rvv_intrinsic_gen/templates/misc_op_template.py @@ -40,6 +40,7 @@ def render(G, op_list, type_list, sew_list, lmul_list, decorator_list): break decorator.write_text_header(G) + inst_type = None for args in prod(OP=op_list, TYPE=type_list, SEW=sew_list, LMUL=lmul_list): type_helper = TypeHelper(**args) if args["OP"] not in ["vundefined"]: