projects / phoronix-test-suite.git / commitdiff
Build Results
 
Summary

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Mon 10/20/14 21:58

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Mon 10/20/14 21:58
Michael Larabel  
Phoronix Test Suite 5.4... 
Mon 10/20/14 21:49
Michael Larabel  
phoromatic: Support for... 
Mon 10/20/14 21:29
Michael Larabel  
phoromatic: Support for... 
Mon 10/20/14 11:32
Michael Larabel  
phoromatic: Introduce... 
Sun 10/12/14 12:55
Michael Larabel  
phoromatic: Improve... 
Sun 10/12/14 12:31
Michael Larabel  
phoromatic: Support for... 
 
> --git a/CHANGE-LOG b/CHANGE-LOG
index 81a8bec
..966b9c2 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -4,+4,@@ Phoronix Test Suite (Git)

 - 
pts-coreIncorporate xx.yy (of xx.yy.zztest profile version string into test result comparison_hash
 
pts-core: Return contained tests hash for result files as a raw SHA1
+- pts-coreImproving passing of compiler flags/options to be reported on test result graphs
 
phodeviAdd file-system magic blocks for eCryptfsAuFSLustreFS, and Panasas PanFS
 
phodeviAdd AVX2 (Advanced Vector Extensions 2CPU instruction set detection

diff 
--git a/pts-core/objects/pts_render.php b/pts-core/objects/pts_render.php
index 6e72ae4
..c9795ae 100644
--- a/pts-core/objects/pts_render.php
+++ b/pts-core/objects/pts_render.php
@@ -490,+490,@@ class pts_render
                 
}
                 break;
             default:
-                
$diff call_user_func_array('array_diff_assoc'$unique_compiler_data);
+                
$diff call_user_func_array('array_diff'$unique_compiler_data);

                 if(
count($diff) == 1)
                 {
@@ -
505,48 +505,38 @@ class pts_render
                     
{
                         if(isset(
$data['compiler-options'][$key]))
                         {
-                            
pts_arrays::unique_push($unique_compiler_dataexplode(' '$data['compiler-options'][$key]));
+                            
$d explode(' '$data['compiler-options'][$key]);
+
+                            if(!
in_array($d$unique_compiler_data))
+                            {
+                                
$unique_compiler_data[$identifier] = $d;
+                            }
                         }
                     }

-                    if(!isset(
$unique_compiler_data[1]))
+                    if(empty(
$unique_compiler_data))
                     {
                         break;
                     }

-                    if((
$c0 count($unique_compiler_data[0])) < ($c1 count($unique_compiler_data[1])))
+                    if(
$key == 'compiler-options')
                     {
-                        for(
$i 0$i < ($c1 $c0); $i++)
-                        {
-                            
// Make the length of the first array the same length
-                            array_push($unique_compiler_data[0], null);
-                        }
+                        
$intersect count($unique_compiler_data) == reset($unique_compiler_data) : call_user_func_array('array_intersect'$unique_compiler_data);
+                        
$graph->addTestNote($compiler_options_string implode(' '$intersect));
                     }

-                    
$diff call_user_func_array('array_diff'$unique_compiler_data);
-
-                    if(
count($diff) == 1)
+                    if(
count($unique_compiler_data) > 1)
                     {
-                        
$diff array_search(array_pop($diff), $unique_compiler_data[0]);
-
-                        if(
$diff !== false)
+                        foreach(
$json as $identifier => &$data)
                         {
-                            if(
$key == 'compiler-options')
+                            if(isset(
$data['compiler-options'][$key]))
                             {
-                                
$intersect call_user_func_array('array_intersect'$unique_compiler_data);
-                                
$graph->addTestNote($compiler_options_string implode(' '$intersect));
-                            }
+                                
$options explode(' '$data['compiler-options'][$key]);
+                                
$diff implode(' 'array_diff($options$intersect));

-                            foreach(
$json as $identifier => &$data)
-                            {
-                                if(isset(
$data['compiler-options'][$key]))
+                                if(
$diff)
                                 {
-                                    
$options explode(' '$data['compiler-options'][$key]);
-
-                                    if(isset(
$options[$diff]) && stripos($identifier$options[$diff]) === false)
-                                    {
-                                        
$graph->addGraphIdentifierNote($identifier$options[$diff]);
-                                    }
+                                    
$graph->addGraphIdentifierNote($identifier$diff);
                                 }
                             }
                         }
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media