Browse Source

* Renamed "IN_TESTS" define to "CONFORMANCE" for benchmarks run
as conformance tests and minimised text output in this mode

J. Gareth "Curious Kit" Moreton 4 months ago
parent
commit
91cf939ca0
4 changed files with 24 additions and 10 deletions
  1. 11 4
      tests/bench/bcase.pp
  2. 9 2
      tests/bench/bfloatfunc.pp
  3. 2 2
      tests/test/cg/tfloatfunc.pp
  4. 2 2
      tests/test/tcase49.pp

+ 11 - 4
tests/bench/bcase.pp

@@ -32,11 +32,11 @@ function IIf(Condition: Boolean; TrueRes, FalseRes: Integer): Integer; inline;
   end;
 
 const
-{$ifdef IN_TESTS}
+{$ifdef CONFORMANCE}
   ITERATIONS = $10000;
-{$else not IN_TESTS}
+{$else CONFORMANCE}
   ITERATIONS = 33554432;
-{$endif not IN_TESTS}
+{$endif CONFORMANCE}
 
   AES_S_Box: array[Byte] of Byte = (
     $63, $7c, $77, $7b, $f2, $6b, $6f, $c5, $30, $01, $67, $2b, $fe, $d7, $ab, $76,
@@ -2642,9 +2642,13 @@ begin
 
           if CurrentObject.WriteResults then
             begin
+{$ifdef CONFORMANCE}
+              WriteLn('Pass');
+{$else CONFORMANCE}
               AverageDuration := ((CurrentObject.RunTime * 1000000000.0) / ITERATIONS);
               WriteLn('Pass - average iteration duration: ', AverageDuration:1:3, ' ns');
               SummedUpAverageDuration := SummedUpAverageDuration + AverageDuration;
+{$endif CONFORMANCE}
             end
           else
             { Final average isn't processed if a test failed, so there's no need
@@ -2665,7 +2669,10 @@ begin
   if Failed then
     Halt(1);
 
+{$ifdef CONFORMANCE}
   WriteLn(#10'ok');
-  WriteLn('- Sum of average durations: ', SummedUpAverageDuration:1:3, ' ns');
+{$else CONFORMANCE}
+  WriteLn(#10'- Sum of average durations: ', SummedUpAverageDuration:1:3, ' ns');
   WriteLn('- Overall average duration: ', (SummedUpAverageDuration / Length(TestClasses)):1:3, ' ns');
+{$endif CONFORMANCE}
 end.

+ 9 - 2
tests/bench/bfloatfunc.pp

@@ -31,7 +31,7 @@ function IIf(Condition: Boolean; TrueRes, FalseRes: Integer): Integer; inline;
   end;
 
 const
-{$ifdef IN_TESTS}
+{$ifdef CONFORMANCE}
   ITERATIONS = $8;
 {$else}
   ITERATIONS = 33554432;
@@ -1775,9 +1775,13 @@ begin
 
           if CurrentObject.WriteResults then
             begin
+{$ifdef CONFORMANCE}
+              WriteLn('Pass');
+{$else CONFORMANCE}
               AverageDuration := ((CurrentObject.RunTime * 1000000000.0) / ITERATIONS);
               WriteLn('Pass - average iteration duration: ', AverageDuration:1:3, ' ns');
               SummedUpAverageDuration := SummedUpAverageDuration + AverageDuration;
+{$endif CONFORMANCE}
             end
           else
             { Final average isn't processed if a test failed, so there's no need
@@ -1798,7 +1802,10 @@ begin
   if Failed then
     Halt(1);
 
+{$ifdef CONFORMANCE}
   WriteLn(#10'ok');
-  WriteLn('- Sum of average durations: ', SummedUpAverageDuration:1:3, ' ns');
+{$else CONFORMANCE}
+  WriteLn(#10'- Sum of average durations: ', SummedUpAverageDuration:1:3, ' ns');
   WriteLn('- Overall average duration: ', (SummedUpAverageDuration / Length(TestClasses)):1:3, ' ns');
+{$endif CONFORMANCE}
 end.

+ 2 - 2
tests/test/cg/tfloatfunc.pp

@@ -1,4 +1,4 @@
 { %OPT=-O3 }
-{ this benchmark can be used also as a test case }
-{$define IN_TESTS}
+{ This benchmark can also be used as a test case }
+{$define CONFORMANCE}
 {$I ../../bench/bfloatfunc.pp}

+ 2 - 2
tests/test/tcase49.pp

@@ -1,4 +1,4 @@
 { %OPT=-O2 }
-{ this benchmark can be used also as a test case }
-{$define IN_TESTS}
+{ This benchmark can also be used as a test case }
+{$define CONFORMANCE}
 {$I ../bench/bcase.pp}