Change static-vars flag to meet CI/CD

Author: jokap11

m2isar/backends/etiss/instruction_generator.py

@@ -24,7 +24,7 @@ def generate_arg_str(arg: arch.FnParam):
 	arg_name = f" {arg.name}" if arg.name is not None else ""
 	return f'{instruction_utils.data_type_map[arg.ty.kind]}{actual_size(arg.ty.size)}{arg_name}'
 
-def generate_functions(core: arch.CoreDef, static_vars: bool, decls_only: bool, generate_coverage: bool):
+def generate_functions(core: arch.CoreDef, static_scalars: bool, decls_only: bool, generate_coverage: bool):
 	"""Return a generator object to generate function behavior code. Uses function
 	definitions in the core object.
 	"""
@@ -50,7 +50,7 @@ def generate_functions(core: arch.CoreDef, static_vars: bool, decls_only: bool,
 		# set up a transformer context and generate code
 		context = instruction_utils.TransformerContext(core.parameters, core.memories, core.memory_aliases, core.register_banks,
 												 core.register_aliases, fn_def.args, fn_def.attributes, core.functions,
-												 0, core_default_width, core_name, static_vars, core.intrinsics, generate_coverage, True)
+												 0, core_default_width, core_name, static_scalars, core.intrinsics, generate_coverage, True)
 
 		logger.debug("generating code for %s", fn_name)
 
@@ -142,7 +142,7 @@ def generate_fields(core_default_width, instr_def: arch.Instruction):
 
 	return (fields_code, asm_printer_code, seen_fields, enc_idx)
 
-def generate_instruction_callback(core: arch.CoreDef, instr_def: arch.Instruction, fields, static_vars: bool, block_end_on: BlockEndType, generate_coverage: bool):
+def generate_instruction_callback(core: arch.CoreDef, instr_def: arch.Instruction, fields, static_scalars: bool, block_end_on: BlockEndType, generate_coverage: bool):
 	visitor = InstructionTransformVisitor()
 
 	instr_name = instr_def.name
@@ -154,7 +154,7 @@ def generate_instruction_callback(core: arch.CoreDef, instr_def: arch.Instructio
 	callback_template = Template(filename=str(template_dir/'etiss_instruction_callback.mako'))
 
 	context = instruction_utils.TransformerContext(core.parameters, core.memories, core.memory_aliases, core.register_banks, core.register_aliases, instr_def.fields, instr_def.attributes,
-							core.functions, enc_idx, core_default_width, core_name, static_vars, core.intrinsics, generate_coverage, False)
+							core.functions, enc_idx, core_default_width, core_name, static_scalars, core.intrinsics, generate_coverage, False)
 
 	# force a block end if necessary
 	if ((attribute_info.InstrAttribute.NO_CONT in instr_def.attributes
@@ -189,7 +189,7 @@ def generate_instruction_callback(core: arch.CoreDef, instr_def: arch.Instructio
 
 	return callback_str
 
-def generate_instructions(core: arch.CoreDef, static_vars: bool, block_end_on: BlockEndType, generate_coverage: bool):
+def generate_instructions(core: arch.CoreDef, static_scalars: bool, block_end_on: BlockEndType, generate_coverage: bool):
 	"""Return a generator object to generate instruction behavior code. Uses instruction
 	definitions in the core object.
 	"""
@@ -246,7 +246,7 @@ def gen_rand_suffix(length: int = 8):
 			instr_def.operation = new_op
 			instr_def.throws = True
 
-		callback_str = generate_instruction_callback(core, instr_def, fields, static_vars, block_end_on, generate_coverage)
+		callback_str = generate_instruction_callback(core, instr_def, fields, static_scalars, block_end_on, generate_coverage)
 
 		# render code for whole instruction
 		templ_str = instr_template.render(

m2isar/backends/etiss/instruction_transform.py

@@ -180,7 +180,7 @@ def _(self, expr: behav.Break, context: TransformerContext):
 	def _(self, expr: behav.VarDefinition, context: TransformerContext):
 		"""Generate a Variable definition. Calculates the actual required data width and generates
 		a variable instantiation."""
-		if context.static_vars:
+		if context.static_scalars:
 			if context.ignore_static:
 				static = attribute_info.AccessAttribute.RW
 			else:
@@ -716,7 +716,7 @@ def _(self, expr: behav.NamedReference, context: TransformerContext):
 			assert isinstance(referred_var.ty, type_info.PrimitiveType)
 			signed = referred_var.ty.kind == type_info.TypeKind.INT
 			size = referred_var.ty.size
-			if context.static_vars:
+			if context.static_scalars:
 				static &= referred_var.attributes.get("static")
 
 		elif isinstance(referred_var, arch.Parameter):

m2isar/backends/etiss/instruction_utils.py

@@ -153,7 +153,7 @@ class TransformerContext:
 	def __init__(self, parameters: "dict[str, arch.Parameter]", memories: "dict[str, arch.Memory]", memory_aliases: "dict[str, arch.Alias]",
 			registers: "dict[str, arch.Memory]", register_aliases: "dict[str, arch.Memory]", fields: "dict[str, arch.BitFieldDescr]",
 			attributes: "list[attribute_info.InstrAttribute]", functions: "dict[str, arch.Function]", instr_size: int, native_size: int,
-			arch_name: str, static_vars: bool, intrinsics, generate_coverage: bool, ignore_static: bool = False):
+			arch_name: str, static_scalars: bool, intrinsics, generate_coverage: bool, ignore_static: bool = False):
 
 		self.parameters = parameters
 		self.memories = memories
@@ -167,7 +167,7 @@ def __init__(self, parameters: "dict[str, arch.Parameter]", memories: "dict[str,
 		self.native_size = native_size
 		self.arch_name = arch_name
 		self.intrinsics = intrinsics
-		self.static_vars = static_vars
+		self.static_scalars = static_scalars
 		self.generate_coverage = generate_coverage
 
 		self.ignore_static = ignore_static

m2isar/backends/etiss/instruction_writer.py

@@ -21,7 +21,7 @@
 
 logger = logging.getLogger("instruction_writer")
 
-def write_functions(core: arch.CoreDef, start_time: str, output_path: pathlib.Path, static_vars: bool, generate_coverage: bool):
+def write_functions(core: arch.CoreDef, start_time: str, output_path: pathlib.Path, static_scalars: bool, generate_coverage: bool):
 	"""Generate and write the {CoreName}Funcs.h file for ETISS."""
 
 	fn_set_header_template = Template(filename=str(template_dir/'etiss_function_set_header.mako'))
@@ -44,7 +44,7 @@ def write_functions(core: arch.CoreDef, start_time: str, output_path: pathlib.Pa
 		funcs_f.write("    // clang-format off\n")
 
 		# generate and write function declarations
-		for fn_name, templ_str in generate_functions(core, static_vars, True, generate_coverage):
+		for fn_name, templ_str in generate_functions(core, static_scalars, True, generate_coverage):
 			logger.debug("writing function decl %s", fn_name)
 			funcs_f.write(templ_str)
 
@@ -63,12 +63,12 @@ def write_functions(core: arch.CoreDef, start_time: str, output_path: pathlib.Pa
 		funcs_f.write("// clang-format off\n")
 
 		# generate and write function definitions
-		for fn_name, templ_str in generate_functions(core, static_vars, False, generate_coverage):
+		for fn_name, templ_str in generate_functions(core, static_scalars, False, generate_coverage):
 			logger.debug("writing function def %s", fn_name)
 			funcs_f.write(templ_str)
 		funcs_f.write("// clang-format on\n")
 
-def write_instructions(core: arch.CoreDef, start_time: str, output_path: pathlib.Path, separate: bool, static_vars: bool,
+def write_instructions(core: arch.CoreDef, start_time: str, output_path: pathlib.Path, separate: bool, static_scalars: bool,
 	block_end_on: BlockEndType, generate_coverage: bool):
 	"""Generate and write the instruction model C++ files for ETISS."""
 
@@ -103,7 +103,7 @@ def write_instructions(core: arch.CoreDef, start_time: str, output_path: pathlib
 			out_f.write(instr_set_str)
 
 		# generate instruction behavior models
-		for instr_name, _, ext_name, templ_str in generate_instructions(core, static_vars, block_end_on, generate_coverage):
+		for instr_name, _, ext_name, templ_str in generate_instructions(core, static_scalars, block_end_on, generate_coverage):
 			logger.debug("writing instruction %s", instr_name)
 			outfiles.get(ext_name, outfiles['default']).write(templ_str)
 		for outfile in outfiles.values():

m2isar/backends/etiss/pickle_writer.py

@@ -22,8 +22,8 @@ def main():
 	for core_name, core in models.items():
 		logger.info("processing model %s", core_name)
 
-		functions[core_name] = dict(instruction_generator.generate_functions(core, args.static_vars))
-		instructions[core_name] = {(code, mask): (instr_name, ext_name, templ_str) for instr_name, (code, mask), ext_name, templ_str in instruction_generator.generate_instructions(core, args.static_vars, BlockEndType[args.block_end_on.upper()])}
+		functions[core_name] = dict(instruction_generator.generate_functions(core, args.static_scalars))
+		instructions[core_name] = {(code, mask): (instr_name, ext_name, templ_str) for instr_name, (code, mask), ext_name, templ_str in instruction_generator.generate_instructions(core, args.static_scalars, BlockEndType[args.block_end_on.upper()])}
 
 	output_path = output_base_path / spec_name
 	output_path.mkdir(exist_ok=True, parents=True)

m2isar/backends/etiss/writer.py

@@ -82,7 +82,7 @@ def setup():
 	parser = argparse.ArgumentParser()
 	parser.add_argument('top_level', help="A .m2isarmodel file containing the models to generate.")
 	parser.add_argument('--separate', action=BooleanOptionalAction, default=True, help="Generate separate .cpp files for each instruction set.")
-	parser.add_argument("--static-vars", action=BooleanOptionalAction, default=True, help="Enable static detection for Variables.")
+	parser.add_argument("--static-scalars", action=BooleanOptionalAction, default=True, help="Enable static detection for Variables.")
 	parser.add_argument("--block-end-on", default="none", choices=[x.name.lower() for x in BlockEndType],
 		help="Force end translation blocks on no instructions, uncoditional jumps or all jumps.")
 	parser.add_argument("--coverage", action=BooleanOptionalAction, default=False, help="Generate coverage tracking code into model.")
@@ -181,8 +181,8 @@ def main():
 		write_arch_lib(core, start_time, output_path)
 		write_arch_cmake(core, start_time, output_path, args.separate)
 		write_arch_gdbcore(core, start_time, output_path, gdb_mapping)
-		write_functions(core, start_time, output_path, args.static_vars, args.coverage)
-		write_instructions(core, start_time, output_path, args.separate, args.static_vars, BlockEndType[args.block_end_on.upper()], args.coverage)
+		write_functions(core, start_time, output_path, args.static_scalars, args.coverage)
+		write_instructions(core, start_time, output_path, args.separate, args.static_scalars, BlockEndType[args.block_end_on.upper()], args.coverage)
 
 		with open(output_path / "coverage.csv", "w") as f:
 			for c_id, c_info in sorted(CodeInfoTracker.tracker[core_name].items()):