@@ -187,20 +187,23 @@ def filter_result(tool, libc, white_list_base_dir, unexpected_results):
187187 arch = ""
188188 abi = ""
189189 cmodel = ""
190+ other_args = []
190191 for info in variation .split ('/' ):
191192 if info .startswith ('-march' ):
192193 arch = info [7 :]
193194 elif info .startswith ('-mabi' ):
194195 abi = info [6 :]
195196 elif info .startswith ('-mcmodel' ):
196197 cmodel = info [9 :]
198+ elif info != 'riscv-sim' :
199+ other_args .append (info )
197200
198201 white_list = \
199202 get_white_list (arch , abi , libc ,
200203 os .path .join (white_list_base_dir , tool ),
201204 is_gcc )
202205 # filter!
203- config = (arch , abi , cmodel )
206+ config = (arch , abi , cmodel , ":" . join ( other_args ) )
204207 fail_count = 0
205208 unexpected_result_list = []
206209 if is_gcc :
@@ -234,8 +237,8 @@ def filter_result(tool, libc, white_list_base_dir, unexpected_results):
234237
235238
236239 if len (unexpected_result_list ) != 0 :
237- print ("\t \t === %s: Unexpected fails for %s %s %s ===" \
238- % (testtool , arch , abi , cmodel ))
240+ print ("\t \t === %s: Unexpected fails for %s %s %s %s ===" \
241+ % (testtool , arch , abi , cmodel , " " . join ( other_args ) ))
239242 for ur in unexpected_result_list :
240243 print (ur )
241244
@@ -257,7 +260,7 @@ def filter_result(tool, libc, white_list_base_dir, unexpected_results):
257260 print (" | # of unexpected case" )
258261 print (" |%s |" % bar )
259262 for config , result in summary .items ():
260- arch , abi , cmodel = config
263+ arch , abi , cmodel , other_args = config
261264 print (" %10s/ %6s/ %6s |" % (arch , abi , cmodel ), end = '' )
262265 for tool in toollist :
263266 if tool not in summary [config ]:
@@ -271,6 +274,8 @@ def filter_result(tool, libc, white_list_base_dir, unexpected_results):
271274 fail_count = summary [config ][tool ]
272275 print ("%13d |" % fail_count , end = '' )
273276 print ("" )
277+ if (len (other_args )):
278+ print (" " + other_args .replace (":" , " " ))
274279 if any_fail or len (summary .items ()) == 0 :
275280 return 1
276281 else :
0 commit comments