[flexsai]: Make code compatible with python3 (opencomputeproject#857)

Signed-off-by: Marian Pritsak <[email protected]>

Author: marian-pritsak

flexsai/p4/backend/json_stage/sai.cpp

@@ -124,19 +124,19 @@ int main_wrapper(int argc, char *const argv[]) {
 #include "p4c_python.cpp"
 
     static int py_argc = 8; //TODO find a better way to use this
-    char * py_argv[py_argc];
-    py_argv[0] = (char*) "P4_compiler.py";
-    py_argv[1] = (char*) "-b";
-    py_argv[2] = (char*) compiler_path.c_str(); 
+    wchar_t * py_argv[py_argc];
+    py_argv[0] = Py_DecodeLocale("P4_compiler.py", NULL);
+    py_argv[1] = Py_DecodeLocale("-b", NULL);
+    py_argv[2] = Py_DecodeLocale(compiler_path.c_str(), NULL); 
     // py_argv[3] = (char*) "-o"; 
     // py_argv[4] = (char*) "output"; //TODO: add possibility to change output path(?)
-    py_argv[3] = (char*) "-p";
-    py_argv[4] = (char*) options.p4RuntimeJsonFile.c_str();
-    py_argv[5] = (char*) "--api";
-    py_argv[6] = (char*) "SAI";
-    py_argv[7] = (char*) options.outputFile.c_str();
+    py_argv[3] = Py_DecodeLocale("-p", NULL);
+    py_argv[4] = Py_DecodeLocale(options.p4RuntimeJsonFile.c_str(), NULL);
+    py_argv[5] = Py_DecodeLocale("--api", NULL);
+    py_argv[6] = Py_DecodeLocale("SAI", NULL);
+    py_argv[7] = Py_DecodeLocale(options.outputFile.c_str(), NULL);
 
-    Py_SetProgramName((char*)"sai_json_compiler");
+    Py_SetProgramName(Py_DecodeLocale("sai_json_compiler", NULL));
     Py_Initialize();
     PySys_SetArgv(py_argc, py_argv);
     std::string compiler = compiler_path + "/output_stage/P4_compiler.py";

flexsai/p4/backend/output_stage/P4_aux.py

@@ -3,7 +3,7 @@
 #  Auxillary functions
 def ensure_dir(directory):
     if not os.path.exists(directory):
-	os.makedirs(directory)
+        os.makedirs(directory)
 
 def get_canonical_c_name(name):
     return name.replace('.','_')

flexsai/p4/backend/output_stage/P4_compiler.py

@@ -39,10 +39,10 @@
 		args.output_path
 		)
 
-print 'argv: '
-print sys.argv
-print 'args:'
-print args
+print('argv: ')
+print(sys.argv)
+print('args:')
+print(args)
 ################################################################
 # local imports
 sys.path.append(os.path.join(args.backend_path,'output_stage'))
@@ -138,7 +138,7 @@ def create_visio(self): # support up to two tables per flow:
 							try:
 								new_line = visio_dicts[i][(table.flexPipe,pipe_index[table.flexPipe])].replace('__TEXT__',table_text)
 							except KeyError:
-								print 'Warning: [visio: %s] table skipped, no place in template'%visio
+								print('Warning: [visio: %s] table skipped, no place in template'%visio)
 								pass
 							o.write(new_line)
 							pipe_index[table.flexPipe] +=1
@@ -147,7 +147,7 @@ def create_visio(self): # support up to two tables per flow:
 						o.write(line)
 
 	def get_header_key(self,key0,key1):
- 		if args.verbose : print ('getting key: %s.%s'%(key0,key1))
+		if args.verbose : print ('getting key: %s.%s'%(key0,key1))
 		# if key0 in self.sai_fixed_headers:
 			# inner = self.sai_fixed_headers[key0]
 			# if key1 in inner:
@@ -245,7 +245,7 @@ def interp_p4c_json_stage_output(lib,json_path):
 	# bmv2 json doesn't save tables in order, need to search by 'base_default_next' field
 
 	print('interp ' + json_path)
-	with open(json_path,'rb') as json_file:
+	with open(json_path,'r') as json_file:
 		j = json.load(json_file)
 		for pipe in lib.flexPipes:
 			# TODO (readability) make dict prio to prevent the below loop
@@ -264,7 +264,7 @@ def interp_p4c_json_stage_output(lib,json_path):
 			while inserted_tables < len(tables) and next_table_name != None:
 				for table in tables:
 					table_name = table['name'] 
-					if args.verbose : print "pipe %s. table %s" % (pipe, table_name)
+					if args.verbose : print("pipe %s. table %s" % (pipe, table_name))
 					if table_name != next_table_name and next_table_name != None:
 						continue
 					table_size = table['max_size']
@@ -294,7 +294,7 @@ def interp_p4c_json_stage_output(lib,json_path):
 							# key_params.append(key['mlnx_extract']);
 							# custom_key_offset.append(i)
 							# if args.verbose : print 'getting custom key ' + json_target
-						if args.verbose : print 'getting predefined key ' + json_target
+						if args.verbose : print('getting predefined key ' + json_target)
 
 					#print key_params
 					if (len(custom_key_offset) > 1):
@@ -308,10 +308,10 @@ def interp_p4c_json_stage_output(lib,json_path):
 					#TODO- process static entries
 					if args.verbose  and 'entries' in table:
 						for ent in table['entries']:
-							print ent['match_key']
+							print(ent['match_key'])
 							# add to table
 					next_table_name = table['base_default_next']
-			if args.verbose  : print 'inserted tables: %d'%inserted_tables
+			if args.verbose  : print ('inserted tables: %d'%inserted_tables)
 			lib.pipe_table_count[pipe]=inserted_tables		
 	return
 
@@ -336,8 +336,8 @@ def is_field_pre_extracted(json_obj, header, field_name):
 								if len(fldlist) == 4: 
 									return fldlist[3]
 								else:
-									print 'Error parsing header field: ' + fld
-									print fldlist
+									print('Error parsing header field: ' + fld)
+									print(fldlist)
 									exit(0)
 					break
 			break
@@ -361,11 +361,11 @@ def is_field_pre_extracted(json_obj, header, field_name):
 print('\n==================================\nCreating %s API \n=================================='%args.api)
 if args.api == 'P4runtime':
 	# import P4_api_grta as api
-	print "This version doesn't support P4rt api"
+	print ("This version doesn't support P4rt api")
 	exit(1)
 if args.api == 'SDK': 
 	# import P4_api_SDK as api
-	print "This version doesn't support SDK api"
+	print ("This version doesn't support SDK api")
 	exit(1)
 if args.api == 'SAI':
 	import P4_api_SAI as api