diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
index db25fcfa8d..5e5b95af38 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -423,7 +423,7 @@ Returns:
   // Call constructor for all libraries
   //
   ProcessLibraryConstructorList (gDxeCoreImageHandle, gST);
-
+  PERF_END   (0,PEI_TOK, NULL, 0) ;
   PERF_START (0,DXE_TOK, NULL, 0) ;
 
   //
diff --git a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
index c94331c010..924336b22d 100644
--- a/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/EdkModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -107,11 +107,11 @@ Returns:
 
   mTick = 0;
 
-#ifdef EFI_PEI_PERFORMANCE
-  if (OldCoreData == NULL) {
-    mTick = GetPerformanceCounter ();
+  if (PerformanceMeasurementEnabled()) {
+    if (OldCoreData == NULL) {
+      mTick = GetPerformanceCounter ();
+    }
   }
-#endif
 
   //
   // For IPF in CAR mode the real memory access is uncached,in InstallPeiMemory()
@@ -178,6 +178,7 @@ Returns:
     //
     // Alert any listeners that there is permanent memory available
     //
+    PERF_START (NULL,"PEI", NULL, mTick);
     PERF_START (NULL,"DisMem", NULL, 0);
     Status = PeiServicesInstallPpi (&mMemoryDiscoveredPpi);
     PERF_END (NULL,"DisMem", NULL, 0);