From 3db391ffa05cb4dfdffcc73e0b3d6a1ad90d63cb Mon Sep 17 00:00:00 2001 From: wenhu <1340773297@qq.com> Date: Wed, 31 Jul 2024 09:54:54 +0800 Subject: [PATCH] modify op name, results type and tests --- include/circt/Dialect/Moore/MooreOps.td | 4 ++-- test/Conversion/ImportVerilog/basic.sv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/circt/Dialect/Moore/MooreOps.td b/include/circt/Dialect/Moore/MooreOps.td index 396f0d1dfc98..81b01da274df 100644 --- a/include/circt/Dialect/Moore/MooreOps.td +++ b/include/circt/Dialect/Moore/MooreOps.td @@ -454,7 +454,7 @@ def NamedConstantOp : MooreOp<"named_constant", [ }]; } -def StringConstantOp : MooreOp<"string", [Pure, ConstantLike]> { +def StringConstantOp : MooreOp<"string_constant", [Pure, ConstantLike]> { let summary = "Produce a constant string value"; let description = [{ Produces a constant value of string type. @@ -465,7 +465,7 @@ def StringConstantOp : MooreOp<"string", [Pure, ConstantLike]> { ``` }]; let arguments = (ins StrAttr:$value); - let results = (outs SimpleBitVectorType:$result); + let results = (outs IntType:$result); let assemblyFormat = "$value attr-dict `:` type($result)"; } diff --git a/test/Conversion/ImportVerilog/basic.sv b/test/Conversion/ImportVerilog/basic.sv index 28ae4053be6b..02c1a05eda62 100644 --- a/test/Conversion/ImportVerilog/basic.sv +++ b/test/Conversion/ImportVerilog/basic.sv @@ -202,13 +202,13 @@ module Basic; MyEnum ev1 = VariantA; MyEnum ev2 = VariantB; -// CHECK: [[STR_WELCOME:%.+]] = moore.string "Welcome to Moore" : i128 +// CHECK: [[STR_WELCOME:%.+]] = moore.string_constant "Welcome to Moore" : i128 // CHECK: [[CONV_WELCOME:%.+]] = moore.conversion [[STR_WELCOME]] : !moore.i128 -> !moore.string // CHECK: [[VAR_S:%.+]] = moore.variable [[CONV_WELCOME]] : string s = "Welcome to Moore"; // CHECK: [[VAR_S1:%.+]] = moore.variable : -// CHECK: [[STR_HELLO:%.+]] = moore.string "Hello World" : i88 +// CHECK: [[STR_HELLO:%.+]] = moore.string_constant "Hello World" : i88 // CHECK: [[CONV_HELLO:%.+]] = moore.conversion [[STR_HELLO]] : !moore.i88 -> !moore.string // CHECK: moore.assign [[VAR_S1]], [[CONV_HELLO]] : string string s1;