Current UefiDpLib implementation depends on TimerLib,
as different platforms may implement and use their
own TimerLib, it makes the dp command needs to be built
by platform. The TimerLib dependency can be removed by
using L"PerfDataMemAddr" variable to make UefiDpLib
to be generic.
Cc: Liming Gao <liming....@intel.com>
Cc: Jiewen Yao <jiewen....@intel.com>
Cc: Cinnamon Shia <cinnamon.s...@hpe.com>
Cc: Jaben Carsey <jaben.car...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.z...@intel.com>
---
ShellPkg/Library/UefiDpLib/Dp.c | 37 ++++++++++++++++++++------------
ShellPkg/Library/UefiDpLib/DpInternal.h | 6 ++----
ShellPkg/Library/UefiDpLib/DpTrace.c | 22 +------------------
ShellPkg/Library/UefiDpLib/Literals.c | 3 +--
ShellPkg/Library/UefiDpLib/UefiDpLib.inf | 6 ++++--
ShellPkg/Library/UefiDpLib/UefiDpLib.uni | 3 ++-
ShellPkg/ShellPkg.dsc | 1 -
7 files changed, 33 insertions(+), 45 deletions(-)
diff --git a/ShellPkg/Library/UefiDpLib/Dp.c b/ShellPkg/Library/UefiDpLib/Dp.c
index 54fd0d1ae163..e5d4e1432289 100644
--- a/ShellPkg/Library/UefiDpLib/Dp.c
+++ b/ShellPkg/Library/UefiDpLib/Dp.c
@@ -13,7 +13,7 @@
Dp uses this information to group records in different ways. It also uses
timer information to calculate elapsed time for each measurement.
- Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -34,7 +34,6 @@
#include <Library/BaseLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/DebugLib.h>
-#include <Library/TimerLib.h>
#include <Library/UefiLib.h>
#include <Guid/Performance.h>
@@ -153,8 +152,8 @@ ShellCommandRunDp (
CONST CHAR16 *CmdLineArg;
EFI_STATUS Status;
- UINT64 Freq;
- UINT64 Ticker;
+ EFI_PHYSICAL_ADDRESS *AcpiLowMemoryBase;
+ PERF_HEADER *PerfHeader;
UINTN Number2Display;
EFI_STRING StringPtr;
@@ -182,11 +181,6 @@ ShellCommandRunDp (
CustomCumulativeData = NULL;
ShellStatus = SHELL_SUCCESS;
- // Get DP's entry time as soon as possible.
- // This is used as the Shell-Phase end time.
- //
- Ticker = GetPerformanceCounter ();
-
//
// initialize the shell lib (we must be in non-auto-init...)
//
@@ -271,14 +265,29 @@ ShellCommandRunDp (
// Timer specific processing
//
// Get the Performance counter characteristics:
- // Freq = Frequency in Hz
+ // Freq = Frequency in KHz
// StartCount = Value loaded into the counter when it starts counting
// EndCount = Value counter counts to before it needs to be reset
//
- Freq = GetPerformanceCounterProperties (&TimerInfo.StartCount,
&TimerInfo.EndCount);
+ Status = GetVariable2 (
+ L"PerfDataMemAddr",
+ &gPerformanceProtocolGuid,
+ &AcpiLowMemoryBase,
+ NULL
+ );
+ if (EFI_ERROR (Status)) {
+ //
+ // Fail to get the variable, return.
+ //
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_GET_VARIABLE_FAILURE),
gDpHiiHandle, L"PerfDataMemAddr", Status);
+ goto Done;
+ }
- // Convert the Frequency from Hz to KHz
- TimerInfo.Frequency = (UINT32)DivU64x32 (Freq, 1000);
+ PerfHeader = (PERF_HEADER *) (UINTN) *AcpiLowMemoryBase;
+ TimerInfo.Frequency = (UINT32) PerfHeader->CpuFreq;
+ TimerInfo.StartCount = PerfHeader->TimerStartValue;
+ TimerInfo.EndCount = PerfHeader->TimerEndValue;
+ FreePool (AcpiLowMemoryBase);
// Determine in which direction the performance counter counts.
TimerInfo.CountUp = (BOOLEAN) (TimerInfo.EndCount >= TimerInfo.StartCount);
@@ -354,7 +363,7 @@ ShellCommandRunDp (
} else {
//------------- Begin Cooked Mode Processing
if (TraceMode) {
- ProcessPhases ( Ticker );
+ ProcessPhases ();
if ( ! SummaryMode) {
Status = ProcessHandles ( ExcludeMode);
if (Status == EFI_ABORTED) {
diff --git a/ShellPkg/Library/UefiDpLib/DpInternal.h
b/ShellPkg/Library/UefiDpLib/DpInternal.h
index b5ec5f0401c0..507adb7c14d5 100644
--- a/ShellPkg/Library/UefiDpLib/DpInternal.h
+++ b/ShellPkg/Library/UefiDpLib/DpInternal.h
@@ -6,7 +6,7 @@
Dp application. In addition to global data, function declarations for
DpUtilities.c, DpTrace.c, and DpProfile.c are included here.
- Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -236,12 +236,10 @@ DumpRawTrace(
/**
Gather and print Major Phase metrics.
- @param[in] Ticker The timer value for the END of Shell phase
-
**/
VOID
ProcessPhases(
- IN UINT64 Ticker
+ VOID
);
diff --git a/ShellPkg/Library/UefiDpLib/DpTrace.c
b/ShellPkg/Library/UefiDpLib/DpTrace.c
index dcb1ca500bef..cb00699c394e 100644
--- a/ShellPkg/Library/UefiDpLib/DpTrace.c
+++ b/ShellPkg/Library/UefiDpLib/DpTrace.c
@@ -386,12 +386,10 @@ DumpRawTrace(
/**
Gather and print Major Phase metrics.
- @param[in] Ticker The timer value for the END of Shell phase
-
**/
VOID
ProcessPhases(
- IN UINT64 Ticker
+ VOID
)
{
MEASUREMENT_RECORD Measurement;
@@ -400,7 +398,6 @@ ProcessPhases(
UINT64 PeiTime;
UINT64 DxeTime;
UINT64 BdsTime;
- UINT64 ShellTime;
UINT64 ElapsedTime;
UINT64 Duration;
UINT64 Total;
@@ -413,7 +410,6 @@ ProcessPhases(
PeiTime = 0;
DxeTime = 0;
BdsTime = 0;
- ShellTime = 0;
//
// Get Execution Phase Statistics
//
@@ -434,9 +430,6 @@ ProcessPhases(
&Measurement.EndTimeStamp,
&Measurement.Identifier)) != 0)
{
- if (AsciiStrnCmp (Measurement.Token, ALit_SHELL, PERF_TOKEN_LENGTH) == 0) {
- Measurement.EndTimeStamp = Ticker;
- }
if (Measurement.EndTimeStamp == 0) { // Skip "incomplete" records
continue;
}
@@ -454,8 +447,6 @@ ProcessPhases(
DxeTime = Duration;
} else if (AsciiStrnCmp (Measurement.Token, ALit_BDS, PERF_TOKEN_LENGTH)
== 0) {
BdsTime = Duration;
- } else if (AsciiStrnCmp (Measurement.Token, ALit_SHELL, PERF_TOKEN_LENGTH)
== 0) {
- ShellTime = Duration;
}
}
@@ -510,17 +501,6 @@ ProcessPhases(
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_PHASE_BDSTO),
gDpHiiHandle, ALit_BdsTO, ElapsedTime);
}
- // print SHELL phase duration time
- //
- if (ShellTime > 0) {
- ElapsedTime = DivU64x32 (
- ShellTime,
- (UINT32)TimerInfo.Frequency
- );
- Total += ElapsedTime;
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_PHASE_DURATION),
gDpHiiHandle, ALit_SHELL, ElapsedTime);
- }
-
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DP_TOTAL_DURATION),
gDpHiiHandle, Total);
}
diff --git a/ShellPkg/Library/UefiDpLib/Literals.c
b/ShellPkg/Library/UefiDpLib/Literals.c
index 68de0fbc9ece..13773bdc3a5a 100644
--- a/ShellPkg/Library/UefiDpLib/Literals.c
+++ b/ShellPkg/Library/UefiDpLib/Literals.c
@@ -1,7 +1,7 @@
/** @file
Definitions of ASCII string literals used by DP.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -16,7 +16,6 @@
CHAR8 const ALit_TimerLibError[] = "Timer library instance error!\n";
CHAR8 const ALit_SEC[] = SEC_TOK;
CHAR8 const ALit_DXE[] = DXE_TOK;
-CHAR8 const ALit_SHELL[] = SHELL_TOK;
CHAR8 const ALit_PEI[] = PEI_TOK;
CHAR8 const ALit_BDS[] = BDS_TOK;
CHAR8 const ALit_BdsTO[] = "BdsTimeOut";
diff --git a/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
b/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
index 70d2163d2bd2..ba3c8d7830a8 100644
--- a/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
+++ b/ShellPkg/Library/UefiDpLib/UefiDpLib.inf
@@ -1,7 +1,7 @@
## @file
# Display Performance Application, Module information file.
#
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
# which accompanies this distribution. The full text of the license may be
found at
@@ -48,7 +48,6 @@ [Packages]
MdeModulePkg/MdeModulePkg.dec
[LibraryClasses]
- TimerLib
PerformanceLib
DxeServicesLib
MemoryAllocationLib
@@ -64,6 +63,9 @@ [LibraryClasses]
PrintLib
DevicePathLib
+[Guids]
+ gPerformanceProtocolGuid ## CONSUMES ##
Variable:L"PerfDataMemAddr"
+
[Protocols]
gEfiLoadedImageProtocolGuid ## CONSUMES
gEfiDriverBindingProtocolGuid ## SOMETIMES_CONSUMES
diff --git a/ShellPkg/Library/UefiDpLib/UefiDpLib.uni
b/ShellPkg/Library/UefiDpLib/UefiDpLib.uni
index b09227451078..64d86be7596c 100644
--- a/ShellPkg/Library/UefiDpLib/UefiDpLib.uni
+++ b/ShellPkg/Library/UefiDpLib/UefiDpLib.uni
@@ -1,7 +1,7 @@
// *++
//
// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>
-// Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
// (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD
License
@@ -35,6 +35,7 @@
#string STR_DP_INVALID_ARG #language en-US "Invalid argument(s)\n"
#string STR_DP_HANDLES_ERROR #language en-US "Locate all handles
error - %r\n"
#string STR_DP_ERROR_NAME #language en-US "Unknown driver name"
+#string STR_DP_GET_VARIABLE_FAILURE #language en-US "Get variable(%s)
failure - %r\n"
#string STR_DP_BUILD_REVISION #language en-US "\nDP Build Version:
%d.%d\n"
#string STR_DP_KHZ #language en-US "System Performance
Timer Frequency: %,8d (KHz)\n"
#string STR_DP_TIMER_PROPERTIES #language en-US "System Performance
Timer counts %s from 0x%Lx to 0x%Lx\n"
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 25c4fadc61f1..1245e762f6f0 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -97,7 +97,6 @@ [Components]
ShellPkg/Library/UefiDpLib/UefiDpLib.inf {
<LibraryClasses>
-
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
}
--
2.7.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
