Run ruff check . --fix --unsafe-fixes

Author: trdthg

riscv-ctg/riscv_ctg/constants.py

@@ -80,13 +80,15 @@ def gen_sp_dataset(bit_width,sign=True):
      :return: a list of integers
     '''
     if sign:
-        conv_func = lambda x: twos(x,bit_width)
+        def conv_func(x):
+            return twos(x, bit_width)
         sqrt_min = int(-sqrt(2**(bit_width-1)))
         sqrt_max = int(sqrt((2**(bit_width-1)-1)))
     else:
         sqrt_min = 0
         sqrt_max = int(sqrt((2**bit_width)-1))
-        conv_func = lambda x:(int(x,16) if '0x' in x else int(x,2)) if isinstance(x,str) else x
+        def conv_func(x):
+            return (int(x, 16) if "0x" in x else int(x, 2)) if isinstance(x, str) else x
 
     dataset = [3, "0x"+"".join(["5"]*int(bit_width/4)), "0x"+"".join(["a"]*int(bit_width/4)), 5, "0x"+"".join(["3"]*int(bit_width/4)), "0x"+"".join(["6"]*int(bit_width/4))]
     dataset = list(map(conv_func,dataset)) + [int(sqrt(abs(conv_func("0x8"+"".join(["0"]*int((bit_width/4)-1)))))*(-1 if sign else 1))] + [sqrt_min,sqrt_max]
@@ -173,9 +175,11 @@ def gen_bitmanip_dataset(bit_width,sign=True):
      :return: a list of integers
     '''
     if sign:
-        conv_func = lambda x: twos(x,bit_width)
+        def conv_func(x):
+            return twos(x, bit_width)
     else:
-        conv_func = lambda x:(int(x,16) if '0x' in x else int(x,2)) if isinstance(x,str) else x
+        def conv_func(x):
+            return (int(x, 16) if "0x" in x else int(x, 2)) if isinstance(x, str) else x
 
 # dataset for 0x5, 0xa, 0x3, 0xc, 0x6, 0x9 patterns
 

riscv-ctg/riscv_ctg/generator.py

@@ -46,7 +46,8 @@ def is_fp_instruction(insn):
 
 from riscv_ctg.dsp_function import *
 
-twos_xlen = lambda x: twos(x,xlen)
+def twos_xlen(x):
+    return twos(x, xlen)
 
 def toint(x: str):
     if '0x' in x:
@@ -89,7 +90,6 @@ def get_rm(opcode):
     'cjformat': [],
     'ckformat': ['rs1'],
     'kformat': ['rs1','rd'],
-    'ckformat': ['rs1'],
     # 'frformat': ['rs1', 'rs2', 'rd'],
     'fsrformat': ['rs1', 'rd'],
     # 'fr4format': ['rs1', 'rs2', 'rs3', 'rd'],
@@ -144,7 +144,6 @@ def get_rm(opcode):
     'cjformat': "['imm_val']",
     'ckformat': "['rs1_val']",
     'kformat': "['rs1_val']",
-    'ckformat': "['rs1_val']",
     # 'frformat': "['rs1_val', 'rs2_val', 'rm_val', 'fcsr']",
     'fsrformat': "['rs1_val','fcsr'] + get_rm(opcode) + \
         ([] if not is_nan_box else ['rs1_nan_prefix']) + \
@@ -187,7 +186,8 @@ def isInt(s):
 
 def get_default_registers(ops, datasets):
     problem = Problem()
-    not_x0 = lambda x: x not in ['x0']
+    def not_x0(x):
+        return x not in ["x0"]
 
     for op in ops:
         dataset = datasets[op]
@@ -348,7 +348,8 @@ def opcomb(self, cgf):
                 op_conds[op] = set([])
         individual = False
         nodiff = False
-        construct_constraint = lambda val: (lambda x: bool(x in val))
+        def construct_constraint(val):
+            return lambda x: bool(x in val)
         while any([len(op_conds[x])!=0 for x in op_conds]+[len(op_comb)!=0]):
             cond_str = ''
             cond_vars = []
@@ -536,7 +537,8 @@ def __jfmt_instr__(self,op=None,val=None):
         if val:
             cond_str += val[-1]
         instr = {'inst':self.opcode,'index':'0', 'comment':cond_str}
-        labelize = lambda x: (str((-x)%2**21),'1b') if x < 0 else (str((x%2**21)),'3f')
+        def labelize(x):
+            return (str(-x % 2 ** 21), "1b") if x < 0 else (str(x % 2 ** 21), "3f")
         if op:
             for var,reg in zip(self.op_vars,op):
                 instr[var] = str(reg)
@@ -572,7 +574,8 @@ def __bfmt_instr__(self,op=None,val=None):
         instr = {'inst':self.opcode,'index':'0', 'comment':cond_str}
 
 
-        labelize = lambda x: (str((-x)%2048),'1b') if x < 0 else (str((x%2048)),'3f')
+        def labelize(x):
+            return (str(-x % 2048), "1b") if x < 0 else (str(x % 2048), "3f")
 
         if op:
             for var,reg in zip(self.op_vars,op):
@@ -603,7 +606,8 @@ def __cb_instr__(self,op=None,val=None):
         instr = {'inst':self.opcode,'index':'0', 'comment':cond_str}
 
 
-        labelize = lambda x: (str((-x)%257),'1b') if x < 0 else (str((x%257)),'3f')
+        def labelize(x):
+            return (str(-x % 257), "1b") if x < 0 else (str(x % 257), "3f")
 
         if op:
             for var,reg in zip(self.op_vars,op):
@@ -634,7 +638,8 @@ def __cj_instr__(self,op=None,val=None):
         instr = {'inst':self.opcode,'index':'0', 'comment':cond_str}
 
 
-        labelize = lambda x: (str((-x)%2048),'1b') if x < 0 else (str((x%2048)),'3f')
+        def labelize(x):
+            return (str(-x % 2048), "1b") if x < 0 else (str(x % 2048), "3f")
 
         if op:
             for var,reg in zip(self.op_vars,op):
@@ -1264,7 +1269,8 @@ def correct_val(self,instr_dict):
                 for i in range(len(instr_dict)):
                     instr_dict[i]['correctval_hi'] = '0'
         if self.fmt in ['caformat','crformat']:
-            normalise = lambda x,y: 0 if y['rs1']=='x0' else x
+            def normalise(x, y):
+                return 0 if y["rs1"] == "x0" else x
         else:
             normalise = (lambda x,y: x) if 'rd' not in self.op_vars else (lambda x,y: 0 if y['rd']=='x0' else x)
         if self.operation:

riscv-ctg/riscv_ctg/misc/bitmanip_real_world.py

@@ -267,7 +267,7 @@
 
 config_ZKs = ['sm3p0','sm3p1','sm4ed','sm4ks']
 
-if os.path.isdir(os.getcwd()+"/real_world_tests") == False:
+if os.path.isdir(os.getcwd()+"/real_world_tests") is False:
 	os.mkdir(os.getcwd()+"/real_world_tests")
 	os.mkdir(os.getcwd()+"/real_world_tests/RV32IK")
 	os.mkdir(os.getcwd()+"/real_world_tests/RV64IK")

riscv-ctg/riscv_ctg/utils.py

@@ -35,7 +35,8 @@ def gen_format_data():
     op_template = load_yaml(const.template_file)
 
     # Initialize nested dictionary
-    nested_dict = lambda: defaultdict(nested_dict)
+    def nested_dict():
+        return defaultdict(nested_dict)
     format_dict = nested_dict()
 
     for mnemonic, data in op_template.items():

riscv-isac/riscv_isac/cgf_normalize.py

@@ -116,13 +116,15 @@ def simd_imm_val(imm, bit_width):
 
 def sp_vals(bit_width,signed):
     if signed:
-        conv_func = lambda x: twos(x,bit_width)
+        def conv_func(x):
+            return twos(x, bit_width)
         sqrt_min = int(-sqrt(2**(bit_width-1)))
         sqrt_max = int(sqrt((2**(bit_width-1)-1)))
     else:
         sqrt_min = 0
         sqrt_max = int(sqrt((2**bit_width)-1))
-        conv_func = lambda x: (int(x,16) if '0x' in x else int(x,2)) if isinstance(x,str) else x
+        def conv_func(x):
+            return (int(x, 16) if '0x' in x else int(x, 2)) if isinstance(x, str) else x
     dataset = [3, "0x"+"".join(["5"]*int(bit_width/4)), "0x"+"".join(["a"]*int(bit_width/4)), 5, "0x"+"".join(["3"]*int(bit_width/4)), "0x"+"".join(["6"]*int(bit_width/4))]
     dataset = list(map(conv_func,dataset)) + [int(sqrt(abs(conv_func("0x8"+"".join(["0"]*int((bit_width/4)-1)))))*(-1 if signed else 1))] + [sqrt_min,sqrt_max]
     return dataset + [x - 1 if x>0 else 0 for x in dataset] + [x+1 for x in dataset]
@@ -149,9 +151,11 @@ def bitmanip_dataset(bit_width,var_lst=["rs1_val","rs2_val"],signed=True):
     datasets = []
     coverpoints = []
     if signed:
-        conv_func = lambda x: twos(x,bit_width)
+        def conv_func(x):
+            return twos(x, bit_width)
     else:
-        conv_func = lambda x: (int(x,16) if '0x' in x else int(x,2)) if isinstance(x,str) else x
+        def conv_func(x):
+            return (int(x, 16) if '0x' in x else int(x, 2)) if isinstance(x, str) else x
 # dataset for 0x5, 0xa, 0x3, 0xc, 0x6, 0x9 patterns
     dataset = ["0x"+"".join(["5"]*int(bit_width/4)), "0x"+"".join(["a"]*int(bit_width/4)), "0x"+"".join(["3"]*int(bit_width/4)), "0x"+"".join(["c"]*int(bit_width/4)),"0x"+"".join(["6"]*int(bit_width/4)),"0x"+"".join(["9"]*int(bit_width/4))]
     dataset = list(map(conv_func,dataset))
@@ -587,7 +591,7 @@ def expand_cgf(cgf_files, xlen,flen, log_redundant=False):
                     # Substitute with tuple of instructions
                     for i in range(len(ops)):
                         exp_alias = utils.import_instr_alias(ops[i])
-                        if exp_alias != None:
+                        if exp_alias is not None:
                             ops[i] = tuple(exp_alias).__str__().replace("'", '').replace(" ", '')
 
                     data[0] = '[' + ':'.join(ops) + ']'

riscv-isac/riscv_isac/coverage.py

@@ -136,10 +136,6 @@
     1005: 'pmpaddr61',
     1006: 'pmpaddr62',
     1007: 'pmpaddr63',
-    928: 'pmpcfg0',
-    929: 'pmpcfg1',
-    930: 'pmpcfg2',
-    931: 'pmpcfg3',
     932: 'pmpcfg4',
     933: 'pmpcfg5',
     934: 'pmpcfg6',
@@ -915,7 +911,7 @@ def compute_per_line(queue, event, cgf_queue, stats_queue, cgf, xlen, flen, addr
 
     # Enter the loop only when Event is not set or when the
     # instruction object queue is not empty
-    while (event.is_set() == False) or (queue.empty() == False):
+    while (event.is_set() is False) or (queue.empty() is False):
 
         # If there are instructions in queue, compute coverage
         if queue.empty() is False:

riscv-isac/riscv_isac/data/rvopcodesdecoder.py

@@ -42,7 +42,8 @@ def setup(self, inxFlag,arch: str):
         self.inxFlag = inxFlag
 
         # Create nested dictionary
-        nested_dict = lambda: defaultdict(nested_dict)
+        def nested_dict():
+            return defaultdict(nested_dict)
         disassembler.INST_DICT = nested_dict()
         disassembler.create_inst_dict('*')
 
@@ -282,7 +283,7 @@ def build_instr_dict(inst_dict):
 
                 new_path = inst_dict[funct[0]][funct[1]]
                 a = disassembler.build_instr_dict(new_path)
-                if a == None:
+                if a is None:
                     continue
                 else:
                     return a
@@ -307,7 +308,7 @@ def get_instr(func_dict, mcode: int):
             temp_func_dict = func_dict[key][val]
             if temp_func_dict.keys():
                 a = disassembler.get_instr(temp_func_dict, mcode)
-                if a == None:
+                if a is None:
                     continue
                 else:
                     return a
@@ -355,11 +356,11 @@ def decode(self, instrObj_temp):
             reg_type = 'x'
             if file_name in ['rv_f', 'rv64_f', 'rv_d','rv64_d']:
                 reg_type = 'f'
-            if file_name in ['rv_f','rv64_f'] and temp_instrobj.inxFlg == True:
+            if file_name in ['rv_f','rv64_f'] and temp_instrobj.inxFlg is True:
                 reg_type = 'x'
             if file_name in ['rv_zfh','rv_d_zfh','rv64_zfh']:
                 reg_type = 'f'
-            if file_name in ['rv_zfh','rv_d_zfh','rv64_zfh'] and temp_instrobj.inxFlg == True:
+            if file_name in ['rv_zfh','rv_d_zfh','rv64_zfh'] and temp_instrobj.inxFlg is True:
                 reg_type = 'x'
             for arg in args[:-1]:
                 if 'rd' in arg:
@@ -370,7 +371,7 @@ def decode(self, instrObj_temp):
                         treg = 'x'
                     temp_instrobj.rd = (int(get_arg_val(arg)(mcode), 2), treg)
 
-                if 'rd' in arg and self.inxFlag == True:
+                if 'rd' in arg and self.inxFlag is True:
                     treg = reg_type
                     if any([instr_name.startswith(x) for x in [
                             'fcvt.w','fcvt.l','fmv.s','fmv.d','flt','feq','fle','fclass','fmv.x','fsqrt','fmax','fmin','fadd','fsub','feq','flt','fle','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fcvt.lu','fcvt.wu']]):
@@ -384,7 +385,7 @@ def decode(self, instrObj_temp):
                         treg = 'x'
                     temp_instrobj.rs1 = (int(get_arg_val(arg)(mcode), 2), treg)
 
-                if 'rs1' in arg and self.inxFlag == True:
+                if 'rs1' in arg and self.inxFlag is True:
                     treg = reg_type
                     if any([instr_name.startswith(x) for x in [
                             'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx','fcvt.lu','fcvt.w','fcvt.wu']]):
@@ -394,7 +395,7 @@ def decode(self, instrObj_temp):
                 if 'rs2' in arg:
                     treg = reg_type
                     temp_instrobj.rs2 = (int(get_arg_val(arg)(mcode), 2), treg)
-                if 'rs2' in arg and self.inxFlag == True:
+                if 'rs2' in arg and self.inxFlag is True:
                     treg = reg_type
                     if any([instr_name.startswith(x) for x in [
                             'fsh', 'fsw','fsd','fcvt.s','fcvt.d','fmv.w','fmv.l','fcvt.h','fmv.h','flh','fclass','fsqrt','fmax','fmin','fadd','fsub','feq','fle','flt','fmul','fdiv','fsgnj','fsgnjn','fsgnjx']]):