Skip to content

Fix microbenchmarks input files #1142

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

Merged
adamsitnik merged 4 commits into from
Jan 22, 2020
Merged

Fix microbenchmarks input files #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ac1f3a
fix benchmarks that are relying on input files
adamsitnik Jan 22, 2020
51f9258
remove text files with invalid line characters
adamsitnik Jan 22, 2020
4bc8da6
this file does not exist anymore
adamsitnik Jan 22, 2020
f2b1087
re-add the files, with proper line endings
adamsitnik Jan 22, 2020
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
17 changes: 8 additions & 9 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
*.md text working-tree-encoding=utf-8 git-encoding=utf-8 eol=lf
*.sh text eol=lf

src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input-big.txt text eol=lf
src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input.txt text eol=lf
src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25.txt text eol=lf
src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25000.txt text eol=lf
src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25.txt text eol=lf
src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25000.txt text eol=lf
src/benchmarks/micro/corefx/System.IO.Compression/TestData/sum text eol=lf
src/benchmarks/micro/corefx/System.IO.Compression/TestData/alice29.txt text eol=lf
src/benchmarks/micro/corefx/System.Text.RegularExpressions/content/200_000.in text eol=lf
src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input-big.txt text eol=lf
src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input.txt text eol=lf
src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25.txt text eol=lf
src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25000.txt text eol=lf
src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25.txt text eol=lf
src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25000.txt text eol=lf
src/benchmarks/micro/libraries/System.IO.Compression/TestData/sum text eol=lf
src/benchmarks/micro/libraries/System.IO.Compression/TestData/alice29.txt text eol=lf
2 changes: 1 addition & 1 deletion src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public CompressedFile(string fileName, CompressionLevel compressionLevel, Func<S
internal static string GetFilePath(string fileName)
=> Path.Combine(
Path.GetDirectoryName(typeof(CompressedFile).Assembly.Location),
"corefx", "System.IO.Compression", "TestData",
"libraries", "System.IO.Compression", "TestData",
fileName);
}
}
2 changes: 1 addition & 1 deletion src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static class Certificates

private static X509Certificate2 GetCertificate(string certificateFileName)
=> new X509Certificate2(
File.ReadAllBytes(Path.Combine("corefx", "System.Net.Http", certificateFileName)),
File.ReadAllBytes(Path.Combine("libraries", "System.Net.Http", certificateFileName)),
CertificatePassword,
X509KeyStorageFlags.DefaultKeySet);
}
Expand Down
2 changes: 1 addition & 1 deletion src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ internal static string FindInputFile(string inputFile)
internal static int GetFileLength(string filePath) => (int) new FileInfo(filePath).Length;

private static string GetFullPath(string fileName)
=> Path.Combine(Path.GetDirectoryName(typeof(InputFileHelper).Assembly.Location), "coreclr", "BenchmarksGame", "Inputs", fileName);
=> Path.Combine(Path.GetDirectoryName(typeof(InputFileHelper).Assembly.Location), "runtime", "BenchmarksGame", "Inputs", fileName);
}
}