Add pair of performance macro function to measure the whole PEI phase's performance.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1704 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
index db25fcfa8de34af0e48b9f21d448ed9505974937..5e5b95af38bb9e3085cc6dfc665f8950f5190b6b 100644 (file)
--- a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -423,7 +423,7 @@ Returns:
   // Call constructor for all libraries\r
   //\r
   ProcessLibraryConstructorList (gDxeCoreImageHandle, gST);\r
-\r
+  PERF_END   (0,PEI_TOK, NULL, 0) ;\r
   PERF_START (0,DXE_TOK, NULL, 0) ;\r
 \r
   //\r

diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
index c94331c010f6474da094c7e1b3329d0a23ab8619..924336b22d47025d9b8e16839f04afc3285767e5 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -107,11 +107,11 @@ Returns:
 \r
   mTick = 0;\r
 \r
-#ifdef EFI_PEI_PERFORMANCE\r
-  if (OldCoreData == NULL) {\r
-    mTick = GetPerformanceCounter ();\r
+  if (PerformanceMeasurementEnabled()) {\r
+    if (OldCoreData == NULL) {\r
+      mTick = GetPerformanceCounter ();\r
+    }\r
   }\r
-#endif\r
 \r
   //\r
   // For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()\r
@@ -178,6 +178,7 @@ Returns:
     //\r
     // Alert any listeners that there is permanent memory available\r
     //\r
+    PERF_START (NULL,"PEI", NULL, mTick);\r
     PERF_START (NULL,"DisMem", NULL, 0);\r
     Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);\r
     PERF_END (NULL,"DisMem", NULL, 0);\r