@ -37,7 +37,8 @@ if __name__ == "__main__":
parser . add_option ( " " , " --module " , dest = " module " , default = None , metavar = " NAME " , help = " module prefix for test names " )
parser . add_option ( " " , " --columns " , dest = " columns " , default = None , metavar = " NAMES " , help = " comma-separated list of column aliases " )
parser . add_option ( " " , " --no-relatives " , action = " store_false " , dest = " calc_relatives " , default = True , help = " do not output relative values " )
parser . add_option ( " " , " --with-cycles-reduction " , action = " store_true " , dest = " calc_cr " , default = False , help = " alos output cycle reduction percentages " )
parser . add_option ( " " , " --with-cycles-reduction " , action = " store_true " , dest = " calc_cr " , default = False , help = " output cycle reduction percentages " )
parser . add_option ( " " , " --with-score " , action = " store_true " , dest = " calc_score " , default = False , help = " output automatic classification of speedups " )
parser . add_option ( " " , " --show-all " , action = " store_true " , dest = " showall " , default = False , help = " also include empty and \" notrun \" lines " )
parser . add_option ( " " , " --match " , dest = " match " , default = None )
parser . add_option ( " " , " --match-replace " , dest = " match_replace " , default = " " )
@ -106,6 +107,7 @@ if __name__ == "__main__":
# build table
getter = metrix_table [ options . metric ] [ 1 ]
getter_score = metrix_table [ " score " ] [ 1 ]
if options . calc_relatives :
getter_p = metrix_table [ options . metric + " % " ] [ 1 ]
if options . calc_cr :
@ -129,6 +131,11 @@ if __name__ == "__main__":
for set in metric_sets :
tbl . newColumn ( str ( i ) + " % " , getSetName ( set , i , options . columns ) + " \n vs \n " + getSetName ( test_sets [ 0 ] , 0 , options . columns ) + " \n (x-factor) " , align = " center " , cssclass = " col_rel " )
i + = 1
if options . calc_score :
i = 1
for set in metric_sets :
tbl . newColumn ( str ( i ) + " S " , getSetName ( set , i , options . columns ) + " \n vs \n " + getSetName ( test_sets [ 0 ] , 0 , options . columns ) + " \n (score) " , align = " center " , cssclass = " col_name " )
i + = 1
# rows
prevGroupName = None
@ -157,6 +164,8 @@ if __name__ == "__main__":
tbl . newCell ( str ( i ) + " % " , " - " )
if options . calc_cr and i > 0 :
tbl . newCell ( str ( i ) + " $ " , " - " )
if options . calc_score and i > 0 :
tbl . newCell ( str ( i ) + " $ " , " - " )
else :
status = case . get ( " status " )
if status != " run " :
@ -167,6 +176,8 @@ if __name__ == "__main__":
tbl . newCell ( str ( i ) + " % " , " - " , color = " red " )
if options . calc_cr and i > 0 :
tbl . newCell ( str ( i ) + " $ " , " - " , color = " red " )
if options . calc_score and i > 0 :
tbl . newCell ( str ( i ) + " S " , " - " , color = " red " )
else :
val = getter ( case , cases [ 0 ] , options . units )
if options . calc_relatives and i > 0 and val :
@ -177,6 +188,10 @@ if __name__ == "__main__":
valcr = getter_cr ( case , cases [ 0 ] , options . units )
else :
valcr = None
if options . calc_score and i > 0 and val :
val_score = getter_score ( case , cases [ 0 ] , options . units )
else :
val_score = None
if not valp or i == 0 :
color = None
elif valp > 1.05 :
@ -192,6 +207,8 @@ if __name__ == "__main__":
tbl . newCell ( str ( i ) + " % " , formatValue ( valp , " % " ) , valp , color = color , bold = color )
if options . calc_cr and i > 0 :
tbl . newCell ( str ( i ) + " $ " , formatValue ( valcr , " $ " ) , valcr , color = color , bold = color )
if options . calc_score and i > 0 :
tbl . newCell ( str ( i ) + " S " , formatValue ( val_score , " S " ) , val_score , color = color , bold = color )
if not needNewRow :
tbl . trimLastRow ( )