Skip to content

Commit

Permalink
Add a couple useful traces to the PNOR build script
Browse files Browse the repository at this point in the history
Added a couple traces that indicate more clearly when and how
we are rearranging sections for our CI tests.

Change-Id: I33dbfa546218684d3039477de0cdfe7f12fb31c6
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71613
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
dcrowell77 committed Feb 15, 2019
1 parent 117289f commit 8995ddc
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/build/buildpnor/PnorUtils.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2016,2018
# Contributors Listed Below - COPYRIGHT 2016,2019
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -161,6 +161,7 @@ sub loadPnorLayout
my $volatile = (exists $sectionEl->{volatile} ? "yes" : "no");
if (($i_testRun == 0) && ($sectionEl->{testonly}[0] eq "yes"))
{
trace(2, "$this_func: Skipping $eyeCatch because this is non-test");
next;
}

Expand Down Expand Up @@ -371,7 +372,7 @@ sub checkSpaceConstraints
# cases fit
if ($testRun && $eyeCatch eq "HBI")
{
print "Adjusting HBI size - ran out of space for test cases\n";
print "$this_func: Adjusting HBI size - ran out of space for test cases\n";
adjustHbiPhysSize(\%sectionHash, $layoutKey, $filesize);
}
else
Expand All @@ -391,6 +392,7 @@ sub checkSpaceConstraints
sub adjustHbiPhysSize
{
my ($i_sectionHashRef, $i_hbiKey, $i_filesize) = @_;
my $this_func = (caller(0))[3];

my %sectionHash = %$i_sectionHashRef;

Expand All @@ -410,7 +412,13 @@ sub adjustHbiPhysSize
if ( $sectionHash{$section}{physicalOffset} >
$sectionHash{$i_hbiKey}{physicalOffset} )
{
my $origoffset = $sectionHash{$section}{physicalOffset};
$sectionHash{$section}{physicalOffset} += $hbi_move;
trace(3, "$this_func: Section $sectionHash{$section}{eyeCatch} : " . sprintf("%X",$origoffset) . " --> " . sprintf("%X",$sectionHash{$section}{physicalOffset}));
}
else
{
printf "$this_func: Section $sectionHash{$section}{eyeCatch} : unchanged";
}
}
}
Expand Down

0 comments on commit 8995ddc

Please sign in to comment.