From 734b93933c0c30ca082c0fe81fe41daae3a2dedc Mon Sep 17 00:00:00 2001 From: Mang Guo Date: Tue, 27 Jan 2015 04:38:18 +0000 Subject: [PATCH] Enabled Performance measurement. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Mang Guo Reviewed-by: David Wei git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16662 6f19259b-4bc3-4df7-8a09-765794883524 --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 18 ++++++++++++------ Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 18 ++++++++++++------ Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 18 ++++++++++++------ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index ee3ec00de3..76d77b3b8f 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -300,7 +300,7 @@ !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/PeiTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(TARGET) == RELEASE @@ -353,7 +353,7 @@ CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE @@ -366,7 +366,7 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE @@ -925,9 +925,7 @@ } IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf -!if $(PERFORMANCE_ENABLE) == TRUE - MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf -!endif + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf { @@ -1053,6 +1051,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf + + PerformancePkg/Dp_App/Dp.inf { + + !if $(PERFORMANCE_ENABLE) == TRUE + PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf + !endif + } Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 540796872d..03b8f2f226 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -300,7 +300,7 @@ !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/PeiTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(TARGET) == RELEASE @@ -353,7 +353,7 @@ CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE @@ -366,7 +366,7 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE @@ -919,9 +919,7 @@ } IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf -!if $(PERFORMANCE_ENABLE) == TRUE - MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf -!endif + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf { @@ -1047,6 +1045,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf + + PerformancePkg/Dp_App/Dp.inf { + + !if $(PERFORMANCE_ENABLE) == TRUE + PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf + !endif + } Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 6ba4f6a64d..b1fa90635a 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -300,7 +300,7 @@ !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/PeiTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(TARGET) == RELEASE @@ -353,7 +353,7 @@ CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE @@ -366,7 +366,7 @@ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf !if $(PERFORMANCE_ENABLE) == TRUE PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf - TimerLib|PerformancePkg/Library/TscTimerLib/DxeTscTimerLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf !endif !if $(SOURCE_DEBUG_ENABLE) == TRUE @@ -919,9 +919,7 @@ } IntelFrameworkModulePkg/Universal/CpuIoDxe/CpuIoDxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf -!if $(PERFORMANCE_ENABLE) == TRUE - MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf -!endif + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf { @@ -1047,6 +1045,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf + + PerformancePkg/Dp_App/Dp.inf { + + !if $(PERFORMANCE_ENABLE) == TRUE + PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf + TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf + !endif + } Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ -- 2.39.2