Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the benchmark build #16604

Merged
merged 5 commits into from
Jan 29, 2024
Merged

Fix the benchmark build #16604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c4639f
Fix the benchmark build
psfinaki Jan 29, 2024
96acaf7
up
psfinaki Jan 29, 2024
00ab19f
Update HistoricalBenchmark.Runner.fsproj
psfinaki Jan 29, 2024
acd8e66
up
psfinaki Jan 29, 2024
b5172ba
try something out
psfinaki Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,8 @@ stages:
steps:
- checkout: self
clean: true
- script: eng\CIBuild.cmd -testBenchmarks
- script: eng\CIBuild.cmd -configuration $(_BuildConfig) -testBenchmarks
displayName: Smoke test fast benchmarks
continueOnError: true
condition: always()

# Test trimming on Windows
- job: Build_And_Test_Trimming_Windows
Expand Down
6 changes: 1 addition & 5 deletions eng/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ function TestUsingMSBuild([string] $testProject, [string] $targetFramework, [str

if ($env:RunningAsPullRequest -ne "true" -and $noTestFilter -eq $false) {
$args += " --filter TestCategory!=PullRequest"
}`
}

if ($asBackgroundJob) {
Write-Host("Starting on the background: $args")
Expand Down Expand Up @@ -549,11 +549,7 @@ try {
}

if ($testBenchmarks) {
$properties_storage = $properties
$properties += "/p:RuntimeIdentifier=win-x64"
$properties += "/p:Configuration=Release" # Always run in release.
BuildSolution "FSharp.Benchmarks.sln" $False
$properties = $properties_storage
Comment on lines -552 to -556
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm almost certain that it won't build without at least the RID.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nono looks like it builds and works like this.

}

if ($pack) {
Expand Down
1 change: 1 addition & 0 deletions ...nchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RootNamespace>HistoricalBenchmark.Utilities</RootNamespace>
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ type TestProjectType =
[<MemoryDiagnoser>]
[<ThreadingDiagnoser>]
[<SimpleJob(warmupCount=1,iterationCount=4)>]
[<BenchmarkCategory(ShortCategory)>]
[<BenchmarkCategory(LongCategory)>]
type TransparentCompilerBenchmark() =

let size = 30
Expand Down
Loading