From 790204b39c4c2813b6e868a7cb0b73ada8d766d6 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Wed, 8 Sep 2021 10:53:46 -0700
Subject: [PATCH] Move native pgo into a targets file instead of being a
 separate project to be more static-graph friendly.

---
 eng/nativepgo.targets                         | 56 ++++++++++++++++
 .../.nuget/optdata/Directory.Build.props      |  4 --
 .../.nuget/optdata/Directory.Build.targets    |  4 --
 src/coreclr/.nuget/optdata/optdata.proj       | 67 -------------------
 src/coreclr/runtime-prereqs.proj              |  4 +-
 src/coreclr/runtime.proj                      | 18 ++---
 6 files changed, 63 insertions(+), 90 deletions(-)
 create mode 100644 eng/nativepgo.targets
 delete mode 100644 src/coreclr/.nuget/optdata/Directory.Build.props
 delete mode 100644 src/coreclr/.nuget/optdata/Directory.Build.targets
 delete mode 100644 src/coreclr/.nuget/optdata/optdata.proj

diff --git a/eng/nativepgo.targets b/eng/nativepgo.targets
new file mode 100644
index 0000000000000..1a5d22e94436d
--- /dev/null
+++ b/eng/nativepgo.targets
@@ -0,0 +1,56 @@
+<Project>
+  <PropertyGroup>
+    <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86')">true</NativeOptimizationDataSupported>
+    <NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'x64'">true</NativeOptimizationDataSupported>
+    <NativeOptimizationDataSupported Condition="'$(NoPgoOptimize)' == 'true'">false</NativeOptimizationDataSupported>
+    <NativeOptimizationDataSupported Condition="'$(DotNetBuildFromSource)' == 'true'">false</NativeOptimizationDataSupported>
+
+    <_NativeOptimizationDataPackageTarget>$(TargetOS.ToLower())-$(TargetArchitecture.ToLower())</_NativeOptimizationDataPackageTarget>
+    <_NativeOptimizationDataPackageTarget Condition="'$(TargetOS)' == 'windows'">windows_nt-$(TargetArchitecture.ToLower())</_NativeOptimizationDataPackageTarget>
+
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="optimization.$(_NativeOptimizationDataPackageTarget).PGO.CoreCLR"
+      Version="$(optimizationPGOCoreCLRVersion)"
+      Condition="'$(optimizationPGOCoreCLRVersion)'!='' And '$(NativeOptimizationDataSupported)'!=''"
+      GeneratePathProperty="true" />
+  </ItemGroup>
+
+
+  <!--                                                                       -->
+  <!-- Task: GetPgoDataPackagePath                                          -->
+  <!--                                                                       -->
+  <!-- Notes:                                                                -->
+  <!--                                                                       -->
+  <!-- DumpPgoDataPackagePath is used to get the path of the native PGO data -->
+  <!-- for other MSBuild projects, generally to pass to another project or   -->
+  <!-- native script like build-runtime.cmd/sh.                              -->
+  <!--                                                                       -->
+
+  <Target Name="GetPgoDataPackagePath" Returns="$(PgoPackagePath)">
+    <PropertyGroup>
+      <PgoPackagePathProperty>Pkgoptimization_$(_NativeOptimizationDataPackageTarget)_PGO_CoreCLR</PgoPackagePathProperty>
+    </PropertyGroup>
+
+    <!--
+      Use an item group for expansion of $($(PgoPackagePathProperty)) (an illegal MSBuild expression)
+      i.e. the prop value's value.
+    -->
+    <ItemGroup>
+      <PgoPackagePathPropertyItemList Include="$(PgoPackagePathProperty)" />
+      <PgoPackagePathPropertyItemList>
+        <PgoPackagePath>$(%(Identity))</PgoPackagePath>
+      </PgoPackagePathPropertyItemList>
+    </ItemGroup>
+
+    <PropertyGroup>
+      <PgoPackagePath>@(PgoPackagePathPropertyItemList->'%(PgoPackagePath)')</PgoPackagePath>
+    </PropertyGroup>
+
+    <Error Condition="!Exists('$(PgoPackagePath)') And '$(NativeOptimizationDataSupported)' == 'true'" Text="Unable to locate restored PGO package at $(PgoPackagePath). Maybe the platform-specific package naming changed?" />
+  </Target>
+
+  <Target Name="OutputPgoPathForCI" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(NativeOptimizationDataSupported)' == 'true'" DependsOnTargets="GetPgoDataPackagePath">
+    <Message Text="##vso[task.setvariable variable=CoreClrPgoDataArg]-pgodatapath &quot;$(PgoPackagePath)&quot;" />
+  </Target>
+</Project>
diff --git a/src/coreclr/.nuget/optdata/Directory.Build.props b/src/coreclr/.nuget/optdata/Directory.Build.props
deleted file mode 100644
index 4ac51105d96d4..0000000000000
--- a/src/coreclr/.nuget/optdata/Directory.Build.props
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-  <!-- OptData projects do not use the build props of the .nuget directory. Instead they use the root build props -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../../'))" />
-</Project>
\ No newline at end of file
diff --git a/src/coreclr/.nuget/optdata/Directory.Build.targets b/src/coreclr/.nuget/optdata/Directory.Build.targets
deleted file mode 100644
index 18aaf2d3aabf4..0000000000000
--- a/src/coreclr/.nuget/optdata/Directory.Build.targets
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-  <!-- OptData projects do not use the build targets of the .nuget directory. Instead they use the root build props -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../../'))" />
-</Project>
\ No newline at end of file
diff --git a/src/coreclr/.nuget/optdata/optdata.proj b/src/coreclr/.nuget/optdata/optdata.proj
deleted file mode 100644
index ba49b5f84e793..0000000000000
--- a/src/coreclr/.nuget/optdata/optdata.proj
+++ /dev/null
@@ -1,67 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets">
-
-  <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-
-    <OptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86')">True</OptimizationDataSupported>
-    <OptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'x64'">True</OptimizationDataSupported>
-
-    <!-- At the moment, we are only generating data for Windows X64 in the most recent optimization data publishing platform. Use the old data for now -->
-    <RuntimeIdentifiers>win7-x64;win7-x86;linux-x64</RuntimeIdentifiers>
-    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
-    <_TargetOSArchLowercase>$(TargetOS.ToLower())-$(TargetArchitecture.ToLower())</_TargetOSArchLowercase>
-    <_TargetOSArchLowercase Condition="'$(TargetOS)' == 'windows'">windows_nt-$(TargetArchitecture.ToLower())</_TargetOSArchLowercase>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="optimization.$(_TargetOSArchLowercase).PGO.CoreCLR"
-      Version="$(optimizationPGOCoreCLRVersion)"
-      Condition="'$(optimizationPGOCoreCLRVersion)'!='' And '$(OptimizationDataSupported)'!=''"
-      GeneratePathProperty="true" />
-  </ItemGroup>
-
-  <!--                                                                       -->
-  <!-- Task: GetPgoDataPackagePath                                          -->
-  <!--                                                                       -->
-  <!-- Notes:                                                                -->
-  <!--                                                                       -->
-  <!-- DumpPgoDataPackagePath is used to get the path of the native PGO data -->
-  <!-- for other MSBuild projects, generally to pass to another project or   -->
-  <!-- native script like build-runtime.cmd/sh.                              -->
-  <!--                                                                       -->
-
-  <Target Name="GetPgoDataPackagePath" Returns="$(PgoPackagePath)">
-    <PropertyGroup>
-      <PgoPackagePathProperty>Pkgoptimization_$(_TargetOSArchLowercase)_PGO_CoreCLR</PgoPackagePathProperty>
-    </PropertyGroup>
-
-    <!--
-      Use an item group for expansion of $($(PgoPackagePathProperty)) (an illegal MSBuild expression)
-      i.e. the prop value's value.
-    -->
-    <ItemGroup>
-      <PgoPackagePathPropertyItemList Include="$(PgoPackagePathProperty)" />
-      <PgoPackagePathPropertyItemList>
-        <PgoPackagePath>$(%(Identity))</PgoPackagePath>
-      </PgoPackagePathPropertyItemList>
-    </ItemGroup>
-
-    <PropertyGroup>
-      <PgoPackagePath>@(PgoPackagePathPropertyItemList->'%(PgoPackagePath)')</PgoPackagePath>
-    </PropertyGroup>
-
-    <Error Condition="!Exists('$(PgoPackagePath)') And '$(OptimizationDataSupported)' == 'True'" Text="Unable to locate restored PGO package at $(PgoPackagePath). Maybe the platform-specific package naming changed?" />
-  </Target>
-
-  <Target Name="OutputPgoPathForCI" Condition="'$(ContinuousIntegrationBuild)' == 'true'" DependsOnTargets="GetPgoDataPackagePath" BeforeTargets="Build">
-    <!-- Get the path to PGO data to pass to AzDO so we can pass it to the build-runtime script. -->
-    <MSBuild
-      Projects=".nuget/optdata/optdata.proj"
-      Targets="GetPgoDataPackagePath">
-      <Output
-        TaskParameter="TargetOutputs"
-        PropertyName="PgoDataPath" />
-    </MSBuild>
-    <Message Text="##vso[task.setvariable variable=CoreClrPgoDataArg]-pgodatapath &quot;$(PgoDataPath)&quot;" />
-  </Target>
-</Project>
diff --git a/src/coreclr/runtime-prereqs.proj b/src/coreclr/runtime-prereqs.proj
index d5fa8a1fec9c5..feabb4fff5f9a 100644
--- a/src/coreclr/runtime-prereqs.proj
+++ b/src/coreclr/runtime-prereqs.proj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include=".nuget/optdata/optdata.proj" />
     <ProjectReference Condition="'$(TargetOS)' == 'Windows'" Include="ToolBox/SOS/DacTableGen/DacTableGen.csproj" />
   </ItemGroup>
 
   <Import Project="$(RepositoryEngineeringDir)versioning.targets" />
+  <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
 
-  <Target Name="BuildPrereqs" BeforeTargets="Build" DependsOnTargets="GenerateRuntimeVersionFile" />
+  <Target Name="BuildPrereqs" BeforeTargets="Build" DependsOnTargets="GenerateRuntimeVersionFile;OutputPgoPathForCI" />
 </Project>
diff --git a/src/coreclr/runtime.proj b/src/coreclr/runtime.proj
index 1e972b6dc85b0..2765ff402f722 100644
--- a/src/coreclr/runtime.proj
+++ b/src/coreclr/runtime.proj
@@ -8,19 +8,11 @@
     <ProjectReference Include="runtime-prereqs.proj" GlobalPropertiesToRemove="$(NativeBuildPartitionPropertiesToRemove)" />
   </ItemGroup>
 
+  <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
+
   <Target Name="BuildRuntime"
+          DependsOnTargets="GetPgoDataPackagePath"
           BeforeTargets="Build">
-
-    <!-- Get the path to PGO data to pass to the runtime build script. -->
-    <MSBuild
-      Projects=".nuget/optdata/optdata.proj"
-      Targets="GetPgoDataPackagePath">
-      <Output
-        TaskParameter="TargetOutputs"
-        PropertyName="PgoDataPath" />
-    </MSBuild>
-
-
     <ItemGroup>
       <_CoreClrBuildArg Condition="'$(TargetArchitecture)' != ''" Include="-$(TargetArchitecture)" />
       <_CoreClrBuildArg Condition="!$([MSBuild]::IsOsPlatform(Windows)) and '$(CMakeArgs)' != ''" Include="$(CMakeArgs)" />
@@ -37,14 +29,14 @@
                                    ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'x64') and
                                    '$(Configuration)' == 'Release' and
                                    '$(ClrRuntimeSubset)' == 'true' and
-                                   '$(NoPgoOptimize)' != 'true' and
+                                   '$(NativeOptimizationDataSupported)' == 'true' and
                                    '$(PgoInstrument)' != 'true'"
                                    Include="-enforcepgo" />
       <_CoreClrBuildArg Condition="$([MSBuild]::IsOsPlatform(Windows)) and '$(CrossDac)' != ''" Include="-$(CrossDac)dac" />
       <_CoreClrBuildArg Condition="'$(Ninja)' == 'true' and !$([MSBuild]::IsOsPlatform(Windows))" Include="-ninja" />
       <_CoreClrBuildArg Condition="'$(Ninja)' == 'false' and $([MSBuild]::IsOsPlatform(Windows))" Include="-msbuild" />
       <_CoreClrBuildArg Condition="'$(PgoInstrument)' == 'true'" Include="-pgoinstrument" />
-      <_CoreClrBuildArg Condition="'$(NoPgoOptimize)' != 'true' and '$(PgoInstrument)' != 'true'" Include="-pgodatapath &quot;$(PgoDataPath)&quot;" />
+      <_CoreClrBuildArg Condition="'$(NativeOptimizationDataSupported)' == 'true' and '$(PgoInstrument)' != 'true'" Include="-pgodatapath &quot;$(PgoPackagePath)&quot;" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(ClrFullNativeBuild)' != 'true'">