Some small bugfixes, clarifications and updates

README.md

@@ -100,7 +100,7 @@ Questions, comments, bug reports, and especially accolades may be directed
 to the developers:
     Laura Caulfield <laura.caulfield@microsoft.com>
     Mark Santaniello <marksan@fb.com>
-    Bikash Sharma <bsharma@microsoft.com>
+    Bikash Sharma <bsharma@fb.com>
 
 Open Source Code of Conduct
 ---------------------------

StorScore.ver

@@ -2,4 +2,4 @@ The results in this directory were generated from
 the version of storscore published on the date listed 
 below.  If there is no date, the results were generated
 from an unpublished & untracked version of code.
-Mon 06/26/2017 12:02:26.88 
+Wed 02/14/2018 11:37:54.68 

lib/DeviceDB/SKHynix.ddb

@@ -33,6 +33,12 @@ use warnings;
 use DeviceDB;
 use Util;
 
+$device_db{'SKhynix Phoenix'} = 
+{
+    'Friendly Name'     => 'SK Hynix PE4011',
+    'Rated PE Cycles'   => 7000,
+};
+
 $device_db{'NVMe f16s_2048h4x4'} =
 {
     'Friendly Name'     => 'SK Hynix PE3011 960GB ES',

lib/DeviceDB/Samsung.ddb

@@ -112,6 +112,11 @@ $device_db{'NVMe SAMSUNG MZ1WV480'} =
     'Friendly Name'   => 'Samsung SM953 480GB',
     'Rated PE Cycles' => 18000,
 };
+$device_db{'SAMSUNG MZ1WV480HCGL-000MV'} =
+{
+    'Friendly Name'   => 'Samsung SM953 480GB',
+    'Rated PE Cycles' => 18000,
+};
 
 $device_db{'NVMe Samsung SSD PM95'} = 
 {
@@ -125,6 +130,12 @@ $device_db{'NVMe SAMSUNG MZ1LV960'} =
     'Rated PE Cycles' => 6000,
 };
 
+$device_db{'SAMSUNG MZ1LV960HCJH-000MU'} = 
+{
+    'Friendly Name'   => 'Samsung PM953 960GB',
+    'Rated PE Cycles' => 6000,
+};
+
 $device_db{'NVMe SAMSUNG MZ1LW960'} = 
 {
     'Friendly Name'   => 'Samsung PM963 960GB',

lib/LogmanParser.pm

@@ -80,7 +80,7 @@ sub parse($$)
         
         if( $counter_name =~ /Processor Time/ )
         {
-            $stats_ref->{'CPU Util'} = $average / 100;
+            $stats_ref->{'CPU Util'} = $average;
             $cpu_seen = 1;
         }
         elsif( $counter_name =~ /Disk Queue Length/ )

parse_results.cmd

@@ -1433,6 +1433,7 @@ sub scores_hash_is_valid(\%)
     # We should see one value per device
     my $expected_num_values = scalar @unique_device_ids;
 
+    my $failed = 0;
     foreach my $test_desc ( keys %scores )
     {
         foreach my $metric ( keys %{ $scores{$test_desc} } )
@@ -1441,14 +1442,15 @@ sub scores_hash_is_valid(\%)
 
             if( $num_values != $expected_num_values )
             {
-                warn "Unexpected number of values: $test_desc, $metric\n";
+                my $ratio = "$num_values/$expected_num_values";
+                warn "Unexpected number of values ($ratio): $test_desc, $metric\n";
 
-                return 0;
+                $failed = 1;
             }
         }
     }
 
-    return 1;
+    return $failed;
 }
 
 sub extract_raw_scores(\@)

recipes/max_power.rcp

@@ -26,15 +26,33 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-test(
-    description         => "2M Sequential Writes",
-    write_percentage    => 100, 
-    access_pattern      => 'sequential',
-    block_size          => '2M',
-    queue_depth         => 128,
-    warmup_time         => 0,
-    run_time            => 7200,
-    precondition        => 0,
-    initialize          => 0,
-    purge		=> 0,
-); 
+if($target->is_ssd)
+{
+   test(
+       description         => "Max Power for SSD",
+       write_percentage    => 100, 
+       access_pattern      => 'sequential',
+       block_size          => '2M',
+       queue_depth         => 128,
+       warmup_time         => 0,
+       run_time            => 7200,
+       precondition        => 0,
+       initialize          => 0,
+       purge               => 0,
+   );
+}
+else
+{
+   test(
+       description         => "Max Power for HDD",
+       write_percentage    => 100, 
+       access_pattern      => 'random',
+       block_size          => '4k',
+       queue_depth         => 128,
+       warmup_time         => 0,
+       run_time            => 7200,
+       precondition        => 0,
+       initialize          => 0,
+       purge               => 0,
+   );
+}