[Compbench-devel] CompBenchmarks++/CBM-PI/t/lib compilers.pl, 1.1, 1.2

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv30328

Modified Files:
	compilers.pl 
Log Message:
Updated interface.

Index: compilers.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib/compilers.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** compilers.pl	10 Apr 2007 17:39:50 -0000	1.1
--- compilers.pl	11 Apr 2007 20:30:18 -0000	1.2
***************
*** 39,48 ****
     #'compiler-fake-gcc-4.1.1-13' => 'gcc-3.0.x',
     'compiler-fake-gcc-2.95.3' => 'gcc-2.95.x',
!    #'compiler-fake-g++-2.95.3' => 'g++-2.95.x'
    );
  
  # This uses previous hash's keys to make test order deterministic.
  #
! our @COMPILER_FAKE_INTERFACES = ('compiler-fake-gcc-2.95.3');
  
  # Following hashs declare known options (in regard of CompBenchmarks XML
--- 39,50 ----
     #'compiler-fake-gcc-4.1.1-13' => 'gcc-3.0.x',
     'compiler-fake-gcc-2.95.3' => 'gcc-2.95.x',
! #   'compiler-fake-g++-2.95.3' => 'g++-2.95.x'
    );
  
  # This uses previous hash's keys to make test order deterministic.
  #
! our @COMPILER_FAKE_INTERFACES = ('compiler-fake-gcc-2.95.3',
! #				 'compiler-fake-g++-2.95.3'
! 				);
  
  # Following hashs declare known options (in regard of CompBenchmarks XML
***************
*** 59,87 ****
  my %COMPILER_FAKE_OPTIONS_GXX_295x =
    (
!    'O0' => ('sets-variable kb-option-mainoptimization'),
!    'Os' => ('sets-variable kb-option-mainoptimization'),
!    'O1' => ('sets-variable kb-option-mainoptimization'),
!    'O2' => ('sets-variable kb-option-mainoptimization'),
!    'O3' => ('sets-variable kb-option-mainoptimization'),
!    'caller-save' => ('implied-by O2'),
!    'cse-follow-jumps' => ('implied-by O2'),
!    'cse-skip-blocks' => ('implied-by O2'),
!    'delayed-branch' => ('implied-by O2'),
!    'expensive-optimizations' => ('implied-by O2'),
!    'fast-math' => ('nop'),
!    'float-store' => ('implied-by O2'),
!    'force-addr' => ('implied-by O2'),
!    'force-mem' => ('implied-by O2'),
!    'inline-functions' => ('implied-by O3'),
!    'omit-frame-pointer' => ('nop'),
!    'rerun-cse-after-loop' => ('implied-by O2'),
!    'schedule-insns' => ('implied-by O2'),
!    'schedule-insns2' => ('implied-by O2'),
!    'strength-reduce' => ('implied-by O2'),
!    'thread-jumps' => ('implied-by O2'),
!    'unroll-all-loops' => ('nop'),
!    'unroll-loops' => ('nop'),
!    'm486' => ('nop'), # !!!
!    'no-fp-ret-in-387' => ('nop'), # !!!?
    );
  
--- 61,89 ----
  my %COMPILER_FAKE_OPTIONS_GXX_295x =
    (
!    'O0' => ['set-variable kb-option-mainoptimization'],
!    'Os' => ['set-variable kb-option-mainoptimization'],
!    'O1' => ['set-variable kb-option-mainoptimization'],
!    'O2' => ['set-variable kb-option-mainoptimization'],
!    'O3' => ['set-variable kb-option-mainoptimization'],
!    'caller-save' => ['nop'],
!    'cse-follow-jumps' => ['implied-by O2 O3'],
!    'cse-skip-blocks' => ['implied-by O2 O3'],
!    'delayed-branch' => ['implied-by O2 O3'],
!    'expensive-optimizations' => ['implied-by O2 O3'],
!    'fast-math' => ['nop'],
!    'float-store' => ['implied-by O2 O3'],
!    'force-addr' => ['implied-by O2 O3'],
!    'force-mem' => ['implied-by O2 O3'],
!    'inline-functions' => ['implied-by O3'],
!    'omit-frame-pointer' => ['nop'],
!    'rerun-cse-after-loop' => ['implied-by O2 O3'],
!    'schedule-insns' => ['implied-by O2 O3'],
!    'schedule-insns2' => ['implied-by O2 O3'],
!    'strength-reduce' => ['implied-by O2 O3'],
!    'thread-jumps' => ['implied-by O2 O3'],
!    'unroll-all-loops' => ['nop'],
!    'unroll-loops' => ['nop'],
!    'm486' => ['nop'], # !!!
!    'no-fp-ret-in-387' => ['nop'], # !!!?
    );
  
***************
*** 89,93 ****
    (
     'gcc-2.95.x' => \%COMPILER_FAKE_OPTIONS_GXX_295x,
! #   'gxx-2.95.x' => \%COMPILER_FAKE_OPTIONS_GXX_295x
    );
  
--- 91,95 ----
    (
     'gcc-2.95.x' => \%COMPILER_FAKE_OPTIONS_GXX_295x,
! #   'g++-2.95.x' => \%COMPILER_FAKE_OPTIONS_GXX_295x
    );
  
***************
*** 99,101 ****
--- 101,114 ----
    return(@o+0);
  }
+ 
+ sub compiler_option_litteral {
+   my $C   = shift;
+   my $oid = shift;
+ 
+   my $OD = $C->OptionDescriptions();
+   my $D  = $OD->Description($oid);
+ 
+   return($D->Option());
+ }
+ 
  1;