Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5491
Modified Files:
compilers.pl
Log Message:
Many changes and updates (more options for 3.0.x, alignment-disabled handling).
Index: compilers.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/lib/compilers.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** compilers.pl 15 Apr 2007 18:14:21 -0000 1.4
--- compilers.pl 17 Apr 2007 17:35:13 -0000 1.5
***************
*** 68,77 ****
'Os' => ['option-exclusive kb-option-mainoptimization',
'option-want alignment-disabled 1'],
! 'O1' => ['option-exclusive kb-option-mainoptimization',
! 'option-want alignment-disabled 0'],
! 'O2' => ['option-exclusive kb-option-mainoptimization',
! 'option-want alignment-disabled 0'],
! 'O3' => ['option-exclusive kb-option-mainoptimization',
! 'option-want alignment-disabled 0'],
'caller-save' => ['nop'],
'cse-follow-jumps' => ['implied-by O2 O3'],
--- 68,74 ----
'Os' => ['option-exclusive kb-option-mainoptimization',
'option-want alignment-disabled 1'],
! 'O1' => ['option-exclusive kb-option-mainoptimization'],
! 'O2' => ['option-exclusive kb-option-mainoptimization'],
! 'O3' => ['option-exclusive kb-option-mainoptimization'],
'caller-save' => ['nop'],
'cse-follow-jumps' => ['implied-by O2 O3'],
***************
*** 89,97 ****
'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'], # !!!?
);
--- 86,100 ----
'schedule-insns2' => ['implied-by O2 O3'],
'strength-reduce' => ['implied-by O2 O3'],
! 'thread-jumps' => ['implied-by O2 O3',
! 'option-want alignment-disabled 0'],
'unroll-all-loops' => ['nop'],
'unroll-loops' => ['nop'],
! );
!
! my %COMPILER_FAKE_OPTIONS_GCC_295x =
! (
! %COMPILER_FAKE_OPTIONS_GXX_295x,
! 'mcpu-486' => ['nop'],
! 'no-fp-ret-in-387' => ['nop']
);
***************
*** 99,103 ****
(
%COMPILER_FAKE_OPTIONS_GXX_295x,
! 'elide-constructors' => ['nop']
);
--- 102,108 ----
(
%COMPILER_FAKE_OPTIONS_GXX_295x,
! 'mcpu-486' => ['nop'],
! 'elide-constructors' => ['nop'],
! 'no-fp-ret-in-387' => ['nop']
);
***************
*** 108,125 ****
'dce' => ['implied-by O2 O3',
'option-require ssa '],
! 'no-align-functions' => ['option-want alignment-disabled 1',
! 'implied-by Os'],
'align-functions' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
! 'no-align-labels' => ['option-want alignment-disabled 1',
! 'implied-by Os'],
'align-labels' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
! 'no-align-loops' => ['option-want alignment-disabled 1',
! 'implied-by Os'],
'align-loops' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
! 'no-align-jumps' => ['option-want alignment-disabled 1',
! 'implied-by Os'],
'align-jumps' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
--- 113,126 ----
'dce' => ['implied-by O2 O3',
'option-require ssa '],
! 'no-align-functions' => ['implied-by Os'],
'align-functions' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
! 'no-align-labels' => ['implied-by Os'],
'align-labels' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
! 'no-align-loops' => ['implied-by Os'],
'align-loops' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
! 'no-align-jumps' => ['implied-by Os'],
'align-jumps' => ['option-want alignment-disabled 0',
'implied-by O2 O3'],
***************
*** 127,136 ****
'strict-aliasing' => ['implied-by O2 O3'],
'gcse' => ['implied-by O2 O3'],
! 'rename-registers' => ['implied-by O2 O3']
);
our %COMPILER_FAKE_OPTIONS =
(
! 'gcc-2.95.x' => \%COMPILER_FAKE_OPTIONS_GXX_295x,
'g++-2.95.x' => \%COMPILER_FAKE_OPTIONS_GPP_295x,
'gcc-3.0.x' => \%COMPILER_FAKE_OPTIONS_GXX_30x,
--- 128,143 ----
'strict-aliasing' => ['implied-by O2 O3'],
'gcse' => ['implied-by O2 O3'],
! 'rename-registers' => ['implied-by O2 O3'],
! 'mcpu-486' => ['option-exclusive kb-option-cpu'],
! 'mcpu-pentium' => ['option-exclusive kb-option-cpu'],
! 'mcpu-pentiumpro' => ['option-exclusive kb-option-cpu'],
! 'mcpu-k6' => ['option-exclusive kb-option-cpu'],
! 'profile-generate' => ['first-pass'],
! 'profile-use' => ['second-pass profile-generate']
);
our %COMPILER_FAKE_OPTIONS =
(
! 'gcc-2.95.x' => \%COMPILER_FAKE_OPTIONS_GCC_295x,
'g++-2.95.x' => \%COMPILER_FAKE_OPTIONS_GPP_295x,
'gcc-3.0.x' => \%COMPILER_FAKE_OPTIONS_GXX_30x,
***************
*** 140,147 ****
sub compiler_option_number_expected {
my $compiler_and_branch = shift;
! my @o = keys %{$COMPILER_FAKE_OPTIONS{$compiler_and_branch}};
! return(@o+0);
}
--- 147,177 ----
sub compiler_option_number_expected {
my $compiler_and_branch = shift;
+ my $result = 0;
! my @options = keys %{$COMPILER_FAKE_OPTIONS{$compiler_and_branch}};
! $result+=(@options+0);
!
! return($result);
! }
!
! sub compiler_option_test_number_expected_twopasses {
! my $compiler_and_branch = shift;
! my $result = 0;
!
! my @options = keys %{$COMPILER_FAKE_OPTIONS{$compiler_and_branch}};
!
! my $o;
! foreach $o (@options) {
! my $r = $COMPILER_FAKE_OPTIONS{$compiler_and_branch}->{$o};
! my $c;
! foreach $c (@{$r}) {
! if ($c =~ /second-pass (.+)/) {
! $result++;
! }
! }
! }
!
! return($result);
}
***************
*** 153,157 ****
my $D = $OD->Description($oid);
! return($D->Option());
}
--- 183,192 ----
my $D = $OD->Description($oid);
! if (!defined($D)) {
! print STDERR "Description not defined for option ID $oid\n";
! return("");
! } else {
! return($D->Option());
! }
}
|
