From 53ffdeb17fa6037a9f3cbe68bf422457504c61c0 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:10:15 +0100 Subject: [PATCH 01/16] don't ignore pfx files, we have few of them in these repo (certificate files used by networking benchmarks) --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4bdaf75cda1..50a80bf0acd 100644 --- a/.gitignore +++ b/.gitignore @@ -249,7 +249,6 @@ ClientBin/ *.dbmdl *.dbproj.schemaview *.jfm -*.pfx *.publishsettings orleans.codegen.cs From 508bb23f01eee751797a29d4a5a1ace2722f5efd Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:39:16 +0100 Subject: [PATCH 02/16] change folder structure: corefx -> libraries, coreclr -> runtime --- src/benchmarks/micro/MicroBenchmarks.csproj | 54 +++++++++--------- .../{corefx => libraries}/Common/ByteUtils.cs | 0 .../{corefx => libraries}/Common/FileUtils.cs | 0 .../CommonUtils/PerfUtils.cs | 0 .../System.Buffers/ArrayPoolTests.cs | 0 .../System.Buffers/Base64Tests.cs | 0 .../System.Buffers/BinaryReadAndWriteTests.cs | 0 .../System.Buffers/ReadOnlySequenceTests.cs | 0 .../System.Buffers/Utf8FormatterTests.cs | 0 .../System.Buffers/Utf8ParserTests.cs | 0 .../System.Collections/Add/AddGivenSize.cs | 0 .../Add/TryAddDefaultSize.cs | 0 .../System.Collections/Add/TryAddGivenSize.cs | 0 .../AddRemove/AddRemoveSteadyState.cs | 0 .../AddRemoveFromDifferentThreads.cs | 0 .../Concurrent/AddRemoveFromSameThreads.cs | 0 .../System.Collections/Concurrent/Count.cs | 0 .../System.Collections/Concurrent/IsEmpty.cs | 0 .../Contains/ContainsFalse.cs | 0 .../Contains/ContainsKeyFalse.cs | 0 .../Contains/ContainsKeyTrue.cs | 0 .../Contains/ContainsTrue.cs | 0 .../System.Collections/CopyTo.cs | 0 .../Create/CtorDefaultSize.cs | 0 .../Create/CtorDefaultSizeNonGeneric.cs | 0 .../Create/CtorFromCollection.cs | 0 .../Create/CtorFromCollectionNonGeneric.cs | 0 .../Create/CtorGivenSize.cs | 0 .../Create/CtorGivenSizeNonGeneric.cs | 0 .../System.Collections/CreateAddAndClear.cs | 0 .../System.Collections/CreateAddAndRemove.cs | 0 .../Dictionary/DictionarySequentialKeys.cs | 0 .../Dictionary/Perf_Dictionary.cs | 0 .../System.Collections/Indexer/IndexerSet.cs | 0 .../Indexer/IndexerSetReverse.cs | 0 .../System.Collections/Iterate/IterateFor.cs | 0 .../Iterate/IterateForEach.cs | 0 .../Iterate/IterateForEachNonGeneric.cs | 0 .../Iterate/IterateForNonGeneric.cs | 0 .../System.Collections/Perf.BitArray.cs | 0 .../System.Collections/Sort.Types.cs | 0 .../System.Collections/Sort.cs | 0 .../SortedSet/Perf_SortedSet.cs | 0 .../TryGetValue/TryGetValueFalse.cs | 0 .../TryGetValue/TryGetValueTrue.cs | 0 .../System.Collections/Utils.cs | 0 .../Perf.TypeDescriptorTests.cs | 0 .../SampleClasses.cs | 0 .../System.Console/Perf.Console.cs | 0 .../System.Diagnostics/Perf_Process.cs | 0 .../System.Drawing/Perf_Color.cs | 0 .../Perf_Graphics_DrawBeziers.cs | 0 .../Perf_Graphics_Transforms.cs | 0 .../System.Drawing/Perf_Image_Load.cs | 0 .../System.Globalization/Perf.CultureInfo.cs | 0 .../Perf.DateTimeCultureInfo.cs | 0 .../Perf.NumberCultureInfo.cs | 0 .../System.Globalization/StringEquality.cs | 0 .../System.Globalization/StringHash.cs | 0 .../System.Globalization/StringSearch.cs | 0 .../System.IO.Compression/Brotli.cs | 0 .../System.IO.Compression/CompressedFile.cs | 0 .../CompressionStreamPerfTestBase.cs | 0 .../TestData/TestDocument.pdf | Bin .../TestData/alice29.txt | 0 .../System.IO.Compression/TestData/sum | Bin .../System.IO.FileSystem/Perf.Directory.cs | 0 .../System.IO.FileSystem/Perf.File.cs | 0 .../System.IO.FileSystem/Perf.FileInfo.cs | 0 .../System.IO.FileSystem/Perf.FileStream.cs | 0 .../Perf.MemoryMappedFile.cs | 0 .../System.IO.MemoryMappedFiles/TempFile.cs | 0 .../System.IO.Pipelines/Perf.Pipe.cs | 0 .../PipeThroughputBenchmark.cs | 0 .../Perf.AnonymousPipeStream.cs | 0 .../System.IO.Pipes/Perf.NamedPipeStream.cs | 0 .../System.IO.Pipes/Perf.PipeTest.cs | 0 .../System.IO.Pipes/PipeTestBase.cs | 0 .../System.Linq/LinqTestData.cs | 0 .../System.Linq/Perf.Enumerable.cs | 0 .../System.Linq/Perf.OrderBy.cs | 0 .../System.Memory/Constructors.cs | 0 .../System.Memory/Memory.cs | 0 .../System.Memory/MemoryMarshal.cs | 0 .../System.Memory/ReadOnlyMemory.cs | 0 .../System.Memory/ReadOnlySequence.cs | 0 .../System.Memory/ReadOnlySpan.cs | 0 .../System.Memory/SequenceReader.cs | 0 .../System.Memory/Slice.cs | 0 .../System.Memory/Span.cs | 0 .../Configuration.Certificates.cs | 0 .../Perf.SocketsHttpHandler.cs | 0 .../testclienteku.contoso.com.pfx | Bin .../testservereku.contoso.com.pfx | Bin .../NetworkInterfaceTests.cs | 0 .../PhysicalAddressTests.cs | 0 .../CredentialCacheTests.cs | 0 .../System.Net.Primitives/DnsTests.cs | 0 .../IPAddressPerformanceTests.cs | 0 .../System.Net.Security/SslStreamTests.cs | 0 .../Perf.Socket.SendReceive.cs | 0 .../GenericVectorConstructorTests.cs | 0 .../GenericVectorFromSpanConstructorTests.cs | 0 .../System.Numerics.Vectors/Perf_Vector2.cs | 0 .../System.Numerics.Vectors/Perf_Vector3.cs | 0 .../System.Numerics.Vectors/Perf_Vector4.cs | 0 .../System.Numerics.Vectors/Util.cs | 0 .../System.Numerics.Vectors/VectorTests.cs | 0 .../System.Runtime.Extensions/Perf.Convert.cs | 0 .../Perf.Environment.cs | 0 .../System.Runtime.Extensions/Perf.Path.cs | 0 .../System.Runtime.Extensions/Perf.Random.cs | 0 .../Perf.StreamWriter.cs | 0 .../Perf.WebUtility.cs | 0 .../SafeHandleTests.cs | 0 .../Perf.BigInteger.cs | 0 .../Perf.BinaryFormatter.cs | 0 .../System.Runtime/Perf.Array.cs | 0 .../System.Runtime/Perf.Boolean.cs | 0 .../System.Runtime/Perf.Byte.cs | 0 .../System.Runtime/Perf.Char.cs | 0 .../System.Runtime/Perf.DateTime.cs | 0 .../System.Runtime/Perf.DateTimeOffset.cs | 0 .../System.Runtime/Perf.Decimal.cs | 0 .../System.Runtime/Perf.Double.cs | 0 .../System.Runtime/Perf.Enum.cs | 0 .../System.Runtime/Perf.Guid.cs | 0 .../System.Runtime/Perf.HashCode.cs | 0 .../System.Runtime/Perf.Int16.cs | 0 .../System.Runtime/Perf.Int32.cs | 0 .../System.Runtime/Perf.Int64.cs | 0 .../System.Runtime/Perf.IntPtr.cs | 0 .../System.Runtime/Perf.Lazy.cs | 0 .../System.Runtime/Perf.Object.cs | 0 .../System.Runtime/Perf.SByte.cs | 0 .../System.Runtime/Perf.Single.cs | 0 .../System.Runtime/Perf.String.cs | 0 .../System.Runtime/Perf.TimeSpan.cs | 0 .../System.Runtime/Perf.Type.cs | 0 .../System.Runtime/Perf.UInt16.cs | 0 .../System.Runtime/Perf.UInt32.cs | 0 .../System.Runtime/Perf.UInt64.cs | 0 .../System.Runtime/Perf.Uri.cs | 0 .../Perf.FixedTimeEquals.cs | 0 .../X509Certificate2Tests.cs | 0 .../Perf.CryptoConfig.cs | 0 .../Perf.Hashing.cs | 0 .../Perf.Rfc2898DeriveBytes.cs | 0 .../System.Text.Encoding/Perf.Encoding.cs | 0 .../Resources/JsonStrings.Designer.cs | 0 .../Resources/JsonStrings.resx | 0 .../Resources/xlf/JsonStrings.cs.xlf | 0 .../Resources/xlf/JsonStrings.de.xlf | 0 .../Resources/xlf/JsonStrings.es.xlf | 0 .../Resources/xlf/JsonStrings.fr.xlf | 0 .../Resources/xlf/JsonStrings.it.xlf | 0 .../Resources/xlf/JsonStrings.ja.xlf | 0 .../Resources/xlf/JsonStrings.ko.xlf | 0 .../Resources/xlf/JsonStrings.pl.xlf | 0 .../Resources/xlf/JsonStrings.pt-BR.xlf | 0 .../Resources/xlf/JsonStrings.ru.xlf | 0 .../Resources/xlf/JsonStrings.tr.xlf | 0 .../Resources/xlf/JsonStrings.zh-Hans.xlf | 0 .../Resources/xlf/JsonStrings.zh-Hant.xlf | 0 .../System.Text.Json/Serializer/ReadJson.cs | 0 .../System.Text.Json/Serializer/WriteJson.cs | 0 .../Utf8JsonReader/Perf.Base64.cs | 0 .../Utf8JsonReader/Perf.Depth.cs | 0 .../Utf8JsonReader/Perf.Reader.cs | 0 .../Utf8JsonReader/Perf.Segment.cs | 0 .../Utf8JsonReader.Comments.Tests.cs | 0 .../Utf8JsonWriter/Perf.Base64.cs | 0 .../Utf8JsonWriter/Perf.Basic.cs | 0 .../Utf8JsonWriter/Perf.Booleans.cs | 0 .../Utf8JsonWriter/Perf.Ctor.cs | 0 .../Utf8JsonWriter/Perf.DateTimes.cs | 0 .../Utf8JsonWriter/Perf.Deep.cs | 0 .../Utf8JsonWriter/Perf.Doubles.cs | 0 .../Utf8JsonWriter/Perf.Guids.cs | 0 .../Utf8JsonWriter/Perf.Strings.cs | 0 .../Perf.Regex.Cache.cs | 0 .../Perf.Regex.Common.cs | 0 .../System.Text/Perf.StringBuilder.cs | 0 .../System.Threading.Channels/Perf.Channel.cs | 0 .../ManualResetValueTaskSource.cs | 0 .../ManualResetValueTaskSourceFactory.cs | 0 .../Perf.ValueTask.cs | 0 .../Perf.AsyncMethods.cs | 0 .../Perf.ThreadPool.cs | 0 .../System.Threading.Timers/Perf.Timer.cs | 0 .../Perf.CancellationToken.cs | 0 .../System.Threading/Perf.EventWaitHandle.cs | 0 .../System.Threading/Perf.Interlocked.cs | 0 .../System.Threading/Perf.Lock.cs | 0 .../System.Threading/Perf.Monitor.cs | 0 .../System.Threading/Perf.SpinLock.cs | 0 .../System.Threading/Perf.Thread.cs | 0 .../System.Threading/Perf.ThreadStatic.cs | 0 .../System.Threading/Perf.Volatile.cs | 0 .../System.Xml.Linq/Perf.XDocument.cs | 0 .../System.Xml.Linq/Perf.XElement.cs | 0 .../System.Xml.Linq/Perf.XElementList.cs | 0 .../System.Xml.Linq/Perf.XName.cs | 0 .../Perf.XmlDocument.cs | 0 .../System.Xml.XmlDocument/Perf.XmlNode.cs | 0 .../Perf.XmlNodeList.cs | 0 .../{corefx => libraries}/System/Hashing.cs | 0 .../BenchmarksGame/Inputs/InputFileHelper.cs | 0 .../Inputs/NucleotideHelpers.cs | 0 .../Inputs/RegexReduxHelpers.cs | 0 .../Inputs/ReverseComplementHelpers.cs | 0 .../Inputs/knucleotide-input-big.txt | 0 .../Inputs/knucleotide-input.txt | 0 .../Inputs/regexdna-input25.txt | 0 .../Inputs/regexdna-input25000.txt | 0 .../BenchmarksGame/Inputs/revcomp-input25.txt | 0 .../Inputs/revcomp-input25000.txt | 0 .../BenchmarksGame/binarytrees-2.cs | 0 .../BenchmarksGame/binarytrees-5.cs | 0 .../BenchmarksGame/fannkuch-redux-2.cs | 0 .../BenchmarksGame/fannkuch-redux-5.cs | 0 .../BenchmarksGame/fasta-1.cs | 0 .../BenchmarksGame/fasta-2.cs | 0 .../BenchmarksGame/k-nucleotide-1.cs | 0 .../BenchmarksGame/k-nucleotide-9.cs | 0 .../BenchmarksGame/mandelbrot-2.cs | 0 .../BenchmarksGame/mandelbrot-7.cs | 0 .../BenchmarksGame/n-body-3.cs | 0 .../BenchmarksGame/pidigits-3.cs | 0 .../BenchmarksGame/regex-redux-1.cs | 0 .../BenchmarksGame/regex-redux-5.cs | 0 .../BenchmarksGame/reverse-complement-1.cs | 0 .../BenchmarksGame/reverse-complement-6.cs | 0 .../BenchmarksGame/spectralnorm-1.cs | 0 .../BenchmarksGame/spectralnorm-3.cs | 0 .../Benchstones/BenchF/Adams.cs | 0 .../Benchstones/BenchF/BenchMk2.cs | 0 .../Benchstones/BenchF/BenchMrk.cs | 0 .../Benchstones/BenchF/Bisect.cs | 0 .../Benchstones/BenchF/DMath.cs | 0 .../Benchstones/BenchF/FFT.cs | 0 .../Benchstones/BenchF/InProd.cs | 0 .../Benchstones/BenchF/InvMt.cs | 0 .../Benchstones/BenchF/LLoops.cs | 0 .../Benchstones/BenchF/Lorenz.cs | 0 .../Benchstones/BenchF/MatInv4.cs | 0 .../Benchstones/BenchF/NewtE.cs | 0 .../Benchstones/BenchF/NewtR.cs | 0 .../Benchstones/BenchF/Regula.cs | 0 .../Benchstones/BenchF/Romber.cs | 0 .../Benchstones/BenchF/Secant.cs | 0 .../Benchstones/BenchF/Simpsn.cs | 0 .../Benchstones/BenchF/SqMtx.cs | 0 .../Benchstones/BenchF/Trap.cs | 0 .../Benchstones/BenchF/Whetsto.cs | 0 .../Benchstones/BenchI/8Queens.cs | 0 .../Benchstones/BenchI/Ackermann.cs | 0 .../Benchstones/BenchI/AddArray.cs | 0 .../Benchstones/BenchI/AddArray2.cs | 0 .../Benchstones/BenchI/Array1.cs | 0 .../Benchstones/BenchI/Array2.cs | 0 .../Benchstones/BenchI/BenchE.cs | 0 .../Benchstones/BenchI/BubbleSort.cs | 0 .../Benchstones/BenchI/BubbleSort2.cs | 0 .../Benchstones/BenchI/CSieve.cs | 0 .../Benchstones/BenchI/Fib.cs | 0 .../Benchstones/BenchI/HeapSort.cs | 0 .../Benchstones/BenchI/IniArray.cs | 0 .../Benchstones/BenchI/LogicArray.cs | 0 .../Benchstones/BenchI/Midpoint.cs | 0 .../Benchstones/BenchI/MulMatrix.cs | 0 .../Benchstones/BenchI/NDhrystone.cs | 0 .../Benchstones/BenchI/Permutate.cs | 0 .../Benchstones/BenchI/Pi.cs | 0 .../Benchstones/BenchI/Puzzle.cs | 0 .../Benchstones/BenchI/QuickSort.cs | 0 .../Benchstones/BenchI/TreeInsert.cs | 0 .../Benchstones/BenchI/TreeSort.cs | 0 .../Benchstones/BenchI/XposMatrix.cs | 0 .../BilinearInterpol/BilinearInterpol.cs | 0 .../{coreclr => runtime}/Burgers/Burgers.cs | 0 .../Burgers/THIRD-PARTY-NOTICES | 0 .../{coreclr => runtime}/Bytemark/ByteMark.cs | 0 .../{coreclr => runtime}/Bytemark/Huffman.cs | 0 .../Bytemark/StringSort.cs | 0 .../Bytemark/THIRD-PARTY-NOTICES | 0 .../Bytemark/assign_jagged.cs | 0 .../Bytemark/assign_rect.cs | 0 .../{coreclr => runtime}/Bytemark/bitops.cs | 0 .../Bytemark/commands/assignjagged.dat | 0 .../Bytemark/commands/assignrect.dat | 0 .../Bytemark/commands/bitfield.dat | 0 .../Bytemark/commands/emfclass.dat | 0 .../Bytemark/commands/emfstruct.dat | 0 .../Bytemark/commands/four.dat | 0 .../Bytemark/commands/huff.dat | 0 .../Bytemark/commands/idea.dat | 0 .../Bytemark/commands/lu.dat | 0 .../Bytemark/commands/nnetjagged.dat | 0 .../Bytemark/commands/nnetrect.dat | 0 .../Bytemark/commands/numsortjagged.dat | 0 .../Bytemark/commands/numsortrect.dat | 0 .../Bytemark/commands/stringsort.dat | 0 .../{coreclr => runtime}/Bytemark/emfloat.cs | 0 .../Bytemark/emfloatclass.cs | 0 .../{coreclr => runtime}/Bytemark/fourier.cs | 0 .../{coreclr => runtime}/Bytemark/idea.cs | 0 .../{coreclr => runtime}/Bytemark/ludecomp.cs | 0 .../Bytemark/neural-dat.cs | 0 .../{coreclr => runtime}/Bytemark/neural.cs | 0 .../Bytemark/neuraljagged.cs | 0 .../{coreclr => runtime}/Bytemark/nnet.dat | 0 .../Bytemark/numericsort.cs | 0 .../{coreclr => runtime}/Bytemark/utility.cs | 0 .../Devirtualization/Boxing.cs | 0 .../DefaultEqualityComparerPerf.cs | 0 .../GuardedThreeClassInterface.cs | 0 .../GuardedThreeClassVirtual.cs | 0 .../GuardedTwoClassInterface.cs | 0 .../GuardedTwoClassVirtual.cs | 0 .../Exceptions/Handling.cs | 0 .../FractalPerf/FractalPerf.cs | 0 .../Inlining/InlineGCStruct.cs | 0 .../Inlining/NoThrowInline.cs | 0 .../Layout/SearchLoops.cs | 0 .../micro/{coreclr => runtime}/Linq/Linq.cs | 0 .../Lowering/InstructionReplacement.cs | 0 .../Math/Functions/DivRem.cs | 0 .../Math/Functions/Double/AbsDouble.cs | 0 .../Math/Functions/Double/AcosDouble.cs | 0 .../Math/Functions/Double/Acosh.cs | 0 .../Math/Functions/Double/AsinDouble.cs | 0 .../Math/Functions/Double/Asinh.cs | 0 .../Math/Functions/Double/Atan2Double.cs | 0 .../Math/Functions/Double/AtanDouble.cs | 0 .../Math/Functions/Double/Atanh.cs | 0 .../Math/Functions/Double/Cbrt.cs | 0 .../Math/Functions/Double/CeilingDouble.cs | 0 .../Math/Functions/Double/CosDouble.cs | 0 .../Math/Functions/Double/CoshDouble.cs | 0 .../Math/Functions/Double/ExpDouble.cs | 0 .../Math/Functions/Double/FloorDouble.cs | 0 .../Math/Functions/Double/FusedMultiplyAdd.cs | 0 .../Math/Functions/Double/ILogB.cs | 0 .../Math/Functions/Double/Log10Double.cs | 0 .../Math/Functions/Double/Log2.cs | 0 .../Math/Functions/Double/LogDouble.cs | 0 .../Math/Functions/Double/PowDouble.cs | 0 .../Math/Functions/Double/RoundDouble.cs | 0 .../Math/Functions/Double/ScaleB.cs | 0 .../Math/Functions/Double/SinDouble.cs | 0 .../Math/Functions/Double/SinhDouble.cs | 0 .../Math/Functions/Double/SqrtDouble.cs | 0 .../Math/Functions/Double/TanDouble.cs | 0 .../Math/Functions/Double/TanhDouble.cs | 0 .../Math/Functions/MathTests.cs | 0 .../Math/Functions/Single/AbsSingle.cs | 0 .../Math/Functions/Single/AcosSingle.cs | 0 .../Math/Functions/Single/Acosh.cs | 0 .../Math/Functions/Single/AsinSingle.cs | 0 .../Math/Functions/Single/Asinh.cs | 0 .../Math/Functions/Single/Atan2Single.cs | 0 .../Math/Functions/Single/AtanSingle.cs | 0 .../Math/Functions/Single/Atanh.cs | 0 .../Math/Functions/Single/Cbrt.cs | 0 .../Math/Functions/Single/CeilingSingle.cs | 0 .../Math/Functions/Single/CosSingle.cs | 0 .../Math/Functions/Single/CoshSingle.cs | 0 .../Math/Functions/Single/ExpSingle.cs | 0 .../Math/Functions/Single/FloorSingle.cs | 0 .../Math/Functions/Single/FusedMultiplyAdd.cs | 0 .../Math/Functions/Single/ILogB.cs | 0 .../Math/Functions/Single/Log10Single.cs | 0 .../Math/Functions/Single/Log2.cs | 0 .../Math/Functions/Single/LogSingle.cs | 0 .../Math/Functions/Single/PowSingle.cs | 0 .../Math/Functions/Single/RoundSingle.cs | 0 .../Math/Functions/Single/ScaleB.cs | 0 .../Math/Functions/Single/SinSingle.cs | 0 .../Math/Functions/Single/SinhSingle.cs | 0 .../Math/Functions/Single/SqrtSingle.cs | 0 .../Math/Functions/Single/TanSingle.cs | 0 .../Math/Functions/Single/TanhSingle.cs | 0 .../PacketTracer/Camera.cs | 0 .../PacketTracer/Color.cs | 0 .../PacketTracer/ColorPacket.cs | 0 .../PacketTracer/Intersections.cs | 0 .../PacketTracer/LightPacket.cs | 0 .../PacketTracer/ObjectPacket.cs | 0 .../PacketTracer/PacketTracer.cs | 0 .../PacketTracer/PlanePacket.cs | 0 .../PacketTracer/RayPacket.cs | 0 .../PacketTracer/Render.cs | 0 .../PacketTracer/Scene.cs | 0 .../PacketTracer/SpherePacket.cs | 0 .../PacketTracer/Surface.cs | 0 .../PacketTracer/Surfaces.cs | 0 .../PacketTracer/Vector.cs | 0 .../PacketTracer/VectorMath.cs | 0 .../PacketTracer/VectorPacket.cs | 0 .../{coreclr => runtime}/Roslyn/CscBench.cs | 0 .../SIMD/ConsoleMandel/Abstractions.cs | 0 .../SIMD/ConsoleMandel/ConsoleMandel.cs | 0 .../SIMD/ConsoleMandel/Interfaces.cs | 0 .../SIMD/ConsoleMandel/ScalarDouble.cs | 0 .../SIMD/ConsoleMandel/ScalarFloat.cs | 0 .../SIMD/ConsoleMandel/VectorDouble.cs | 0 .../SIMD/ConsoleMandel/VectorDoubleStrict.cs | 0 .../SIMD/ConsoleMandel/VectorFloat.cs | 0 .../SIMD/ConsoleMandel/VectorFloatStrict.cs | 0 .../SIMD/ConsoleMandel/VectorHelpers.cs | 0 .../SIMD/RayTracer/Camera.cs | 0 .../SIMD/RayTracer/Color.cs | 0 .../SIMD/RayTracer/ISect.cs | 0 .../SIMD/RayTracer/Light.cs | 0 .../SIMD/RayTracer/ObjectPool.cs | 0 .../SIMD/RayTracer/Plane.cs | 0 .../ProducerConsumerCollectionBase.cs | 0 .../SIMD/RayTracer/Ray.cs | 0 .../SIMD/RayTracer/RayTracerBench.cs | 0 .../SIMD/RayTracer/Raytracer.cs | 0 .../SIMD/RayTracer/Scene.cs | 0 .../SIMD/RayTracer/SceneObject.cs | 0 .../SIMD/RayTracer/Sphere.cs | 0 .../SIMD/RayTracer/Surface.cs | 0 .../SIMD/RayTracer/Surfaces.cs | 0 .../SIMD/RayTracer/Vector.cs | 0 .../SIMD/SeekUnroll/SeekUnroll.cs | 0 .../{coreclr => runtime}/SciMark/Constants.cs | 0 .../micro/{coreclr => runtime}/SciMark/FFT.cs | 0 .../micro/{coreclr => runtime}/SciMark/LU.cs | 0 .../SciMark/MonteCarlo.cs | 0 .../{coreclr => runtime}/SciMark/Random.cs | 0 .../micro/{coreclr => runtime}/SciMark/SOR.cs | 0 .../SciMark/SparseCompRow.cs | 0 .../SciMark/THIRD-PARTY-NOTICES | 0 .../{coreclr => runtime}/SciMark/kernel.cs | 0 .../{coreclr => runtime}/Span/Indexer.cs | 0 .../{coreclr => runtime}/Span/Sorting.cs | 0 .../System.Reflection/Activator.cs | 0 .../System.Reflection/Attributes.cs | 0 .../{coreclr => runtime}/V8/Crypto/Crypto.cs | 0 .../V8/Crypto/THIRD-PARTY-NOTICES | 0 .../V8/Richards/Richards.cs | 0 .../V8/Richards/THIRD-PARTY-NOTICES | 0 .../perflab/BlockCopyPerf.cs | 0 .../perflab/CastingPerf.cs | 0 .../perflab/CastingPerf2.cs | 0 .../perflab/DelegatePerf.cs | 0 .../perflab/DictionaryExpansion.cs | 0 .../{coreclr => runtime}/perflab/EnumPerf.cs | 0 .../perflab/LowLevelPerf.cs | 0 .../perflab/ReflectionPerf.cs | 0 .../{coreclr => runtime}/perflab/StackWalk.cs | 0 454 files changed, 27 insertions(+), 27 deletions(-) rename src/benchmarks/micro/{corefx => libraries}/Common/ByteUtils.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/Common/FileUtils.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/CommonUtils/PerfUtils.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Buffers/ArrayPoolTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Buffers/Base64Tests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Buffers/BinaryReadAndWriteTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Buffers/ReadOnlySequenceTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Buffers/Utf8FormatterTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Buffers/Utf8ParserTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Add/AddGivenSize.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Add/TryAddDefaultSize.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Add/TryAddGivenSize.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/AddRemove/AddRemoveSteadyState.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Concurrent/AddRemoveFromSameThreads.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Concurrent/Count.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Concurrent/IsEmpty.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Contains/ContainsFalse.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Contains/ContainsKeyFalse.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Contains/ContainsKeyTrue.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Contains/ContainsTrue.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/CopyTo.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Create/CtorDefaultSize.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Create/CtorDefaultSizeNonGeneric.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Create/CtorFromCollection.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Create/CtorFromCollectionNonGeneric.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Create/CtorGivenSize.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Create/CtorGivenSizeNonGeneric.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/CreateAddAndClear.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/CreateAddAndRemove.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Dictionary/DictionarySequentialKeys.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Dictionary/Perf_Dictionary.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Indexer/IndexerSet.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Indexer/IndexerSetReverse.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Iterate/IterateFor.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Iterate/IterateForEach.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Iterate/IterateForEachNonGeneric.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Iterate/IterateForNonGeneric.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Perf.BitArray.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Sort.Types.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Sort.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/SortedSet/Perf_SortedSet.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/TryGetValue/TryGetValueFalse.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/TryGetValue/TryGetValueTrue.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Collections/Utils.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.ComponentModel.TypeConverter/SampleClasses.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Console/Perf.Console.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Diagnostics/Perf_Process.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Drawing/Perf_Color.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Drawing/Perf_Graphics_DrawBeziers.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Drawing/Perf_Graphics_Transforms.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Drawing/Perf_Image_Load.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Globalization/Perf.CultureInfo.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Globalization/Perf.DateTimeCultureInfo.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Globalization/Perf.NumberCultureInfo.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Globalization/StringEquality.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Globalization/StringHash.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Globalization/StringSearch.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Compression/Brotli.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Compression/CompressedFile.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Compression/CompressionStreamPerfTestBase.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Compression/TestData/TestDocument.pdf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Compression/TestData/alice29.txt (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Compression/TestData/sum (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.FileSystem/Perf.Directory.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.FileSystem/Perf.File.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.FileSystem/Perf.FileInfo.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.FileSystem/Perf.FileStream.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.MemoryMappedFiles/TempFile.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Pipelines/Perf.Pipe.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Pipelines/PipeThroughputBenchmark.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Pipes/Perf.AnonymousPipeStream.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Pipes/Perf.NamedPipeStream.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Pipes/Perf.PipeTest.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.IO.Pipes/PipeTestBase.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Linq/LinqTestData.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Linq/Perf.Enumerable.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Linq/Perf.OrderBy.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/Constructors.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/Memory.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/MemoryMarshal.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/ReadOnlyMemory.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/ReadOnlySequence.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/ReadOnlySpan.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/SequenceReader.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/Slice.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Memory/Span.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Http/Configuration.Certificates.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Http/Perf.SocketsHttpHandler.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Http/testclienteku.contoso.com.pfx (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Http/testservereku.contoso.com.pfx (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.NetworkInformation/NetworkInterfaceTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.NetworkInformation/PhysicalAddressTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Primitives/CredentialCacheTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Primitives/DnsTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Primitives/IPAddressPerformanceTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Security/SslStreamTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Net.Sockets/Perf.Socket.SendReceive.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/GenericVectorConstructorTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/GenericVectorFromSpanConstructorTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/Perf_Vector2.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/Perf_Vector3.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/Perf_Vector4.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/Util.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Numerics.Vectors/VectorTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Extensions/Perf.Convert.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Extensions/Perf.Environment.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Extensions/Perf.Path.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Extensions/Perf.Random.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Extensions/Perf.StreamWriter.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Extensions/Perf.WebUtility.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.InteropServices/SafeHandleTests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Numerics/Perf.BigInteger.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Array.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Boolean.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Byte.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Char.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.DateTime.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.DateTimeOffset.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Decimal.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Double.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Enum.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Guid.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.HashCode.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Int16.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Int32.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Int64.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.IntPtr.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Lazy.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Object.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.SByte.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Single.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.String.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.TimeSpan.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Type.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.UInt16.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.UInt32.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.UInt64.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Runtime/Perf.Uri.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Security.Cryptography/Perf.CryptoConfig.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Security.Cryptography/Perf.Hashing.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Encoding/Perf.Encoding.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/JsonStrings.Designer.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/JsonStrings.resx (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.cs.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.de.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.es.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.fr.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.it.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.ja.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.ko.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.pl.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.pt-BR.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.ru.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.tr.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.zh-Hans.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Resources/xlf/JsonStrings.zh-Hant.xlf (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Serializer/ReadJson.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Serializer/WriteJson.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonReader/Perf.Base64.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonReader/Perf.Depth.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonReader/Perf.Reader.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonReader/Perf.Segment.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.RegularExpressions/Perf.Regex.Cache.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text.RegularExpressions/Perf.Regex.Common.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Text/Perf.StringBuilder.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.Channels/Perf.Channel.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.Tasks.Extensions/ManualResetValueTaskSource.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.Tasks.Extensions/ManualResetValueTaskSourceFactory.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.Tasks.Extensions/Perf.ValueTask.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.Tasks/Perf.AsyncMethods.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.ThreadPool/Perf.ThreadPool.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading.Timers/Perf.Timer.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.CancellationToken.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.EventWaitHandle.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.Interlocked.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.Lock.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.Monitor.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.SpinLock.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.Thread.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.ThreadStatic.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Threading/Perf.Volatile.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.Linq/Perf.XDocument.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.Linq/Perf.XElement.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.Linq/Perf.XElementList.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.Linq/Perf.XName.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.XmlDocument/Perf.XmlDocument.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.XmlDocument/Perf.XmlNode.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System.Xml.XmlDocument/Perf.XmlNodeList.cs (100%) rename src/benchmarks/micro/{corefx => libraries}/System/Hashing.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/InputFileHelper.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/NucleotideHelpers.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/RegexReduxHelpers.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/ReverseComplementHelpers.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/knucleotide-input-big.txt (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/knucleotide-input.txt (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/regexdna-input25.txt (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/regexdna-input25000.txt (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/revcomp-input25.txt (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/Inputs/revcomp-input25000.txt (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/binarytrees-2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/binarytrees-5.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/fannkuch-redux-2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/fannkuch-redux-5.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/fasta-1.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/fasta-2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/k-nucleotide-1.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/k-nucleotide-9.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/mandelbrot-2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/mandelbrot-7.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/n-body-3.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/pidigits-3.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/regex-redux-1.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/regex-redux-5.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/reverse-complement-1.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/reverse-complement-6.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/spectralnorm-1.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BenchmarksGame/spectralnorm-3.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Adams.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/BenchMk2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/BenchMrk.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Bisect.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/DMath.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/FFT.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/InProd.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/InvMt.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/LLoops.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Lorenz.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/MatInv4.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/NewtE.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/NewtR.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Regula.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Romber.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Secant.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Simpsn.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/SqMtx.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Trap.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchF/Whetsto.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/8Queens.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Ackermann.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/AddArray.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/AddArray2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Array1.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Array2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/BenchE.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/BubbleSort.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/BubbleSort2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/CSieve.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Fib.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/HeapSort.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/IniArray.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/LogicArray.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Midpoint.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/MulMatrix.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/NDhrystone.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Permutate.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Pi.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/Puzzle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/QuickSort.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/TreeInsert.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/TreeSort.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Benchstones/BenchI/XposMatrix.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/BilinearInterpol/BilinearInterpol.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Burgers/Burgers.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Burgers/THIRD-PARTY-NOTICES (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/ByteMark.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/Huffman.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/StringSort.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/THIRD-PARTY-NOTICES (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/assign_jagged.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/assign_rect.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/bitops.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/assignjagged.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/assignrect.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/bitfield.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/emfclass.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/emfstruct.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/four.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/huff.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/idea.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/lu.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/nnetjagged.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/nnetrect.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/numsortjagged.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/numsortrect.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/commands/stringsort.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/emfloat.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/emfloatclass.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/fourier.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/idea.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/ludecomp.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/neural-dat.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/neural.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/neuraljagged.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/nnet.dat (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/numericsort.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Bytemark/utility.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Devirtualization/Boxing.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Devirtualization/DefaultEqualityComparerPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Devirtualization/GuardedThreeClassInterface.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Devirtualization/GuardedThreeClassVirtual.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Devirtualization/GuardedTwoClassInterface.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Devirtualization/GuardedTwoClassVirtual.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Exceptions/Handling.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/FractalPerf/FractalPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Inlining/InlineGCStruct.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Inlining/NoThrowInline.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Layout/SearchLoops.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Linq/Linq.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Lowering/InstructionReplacement.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/DivRem.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/AbsDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/AcosDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Acosh.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/AsinDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Asinh.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Atan2Double.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/AtanDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Atanh.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Cbrt.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/CeilingDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/CosDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/CoshDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/ExpDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/FloorDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/FusedMultiplyAdd.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/ILogB.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Log10Double.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/Log2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/LogDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/PowDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/RoundDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/ScaleB.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/SinDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/SinhDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/SqrtDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/TanDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Double/TanhDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/MathTests.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/AbsSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/AcosSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Acosh.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/AsinSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Asinh.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Atan2Single.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/AtanSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Atanh.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Cbrt.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/CeilingSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/CosSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/CoshSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/ExpSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/FloorSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/FusedMultiplyAdd.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/ILogB.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Log10Single.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/Log2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/LogSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/PowSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/RoundSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/ScaleB.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/SinSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/SinhSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/SqrtSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/TanSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Math/Functions/Single/TanhSingle.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Camera.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Color.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/ColorPacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Intersections.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/LightPacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/ObjectPacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/PacketTracer.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/PlanePacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/RayPacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Render.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Scene.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/SpherePacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Surface.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Surfaces.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/Vector.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/VectorMath.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/PacketTracer/VectorPacket.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Roslyn/CscBench.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/Abstractions.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/ConsoleMandel.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/Interfaces.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/ScalarDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/ScalarFloat.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/VectorDouble.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/VectorDoubleStrict.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/VectorFloat.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/VectorFloatStrict.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/ConsoleMandel/VectorHelpers.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Camera.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Color.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/ISect.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Light.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/ObjectPool.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Plane.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/ProducerConsumerCollectionBase.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Ray.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/RayTracerBench.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Raytracer.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Scene.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/SceneObject.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Sphere.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Surface.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Surfaces.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/RayTracer/Vector.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SIMD/SeekUnroll/SeekUnroll.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/Constants.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/FFT.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/LU.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/MonteCarlo.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/Random.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/SOR.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/SparseCompRow.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/THIRD-PARTY-NOTICES (100%) rename src/benchmarks/micro/{coreclr => runtime}/SciMark/kernel.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Span/Indexer.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/Span/Sorting.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/System.Reflection/Activator.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/System.Reflection/Attributes.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/V8/Crypto/Crypto.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/V8/Crypto/THIRD-PARTY-NOTICES (100%) rename src/benchmarks/micro/{coreclr => runtime}/V8/Richards/Richards.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/V8/Richards/THIRD-PARTY-NOTICES (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/BlockCopyPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/CastingPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/CastingPerf2.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/DelegatePerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/DictionaryExpansion.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/EnumPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/LowLevelPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/ReflectionPerf.cs (100%) rename src/benchmarks/micro/{coreclr => runtime}/perflab/StackWalk.cs (100%) diff --git a/src/benchmarks/micro/MicroBenchmarks.csproj b/src/benchmarks/micro/MicroBenchmarks.csproj index d98108602e7..79c8f504c61 100644 --- a/src/benchmarks/micro/MicroBenchmarks.csproj +++ b/src/benchmarks/micro/MicroBenchmarks.csproj @@ -43,48 +43,48 @@ - + PreserveNewest - + PreserveNewest - + PreserveNewest - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + diff --git a/src/benchmarks/micro/corefx/Common/ByteUtils.cs b/src/benchmarks/micro/libraries/Common/ByteUtils.cs similarity index 100% rename from src/benchmarks/micro/corefx/Common/ByteUtils.cs rename to src/benchmarks/micro/libraries/Common/ByteUtils.cs diff --git a/src/benchmarks/micro/corefx/Common/FileUtils.cs b/src/benchmarks/micro/libraries/Common/FileUtils.cs similarity index 100% rename from src/benchmarks/micro/corefx/Common/FileUtils.cs rename to src/benchmarks/micro/libraries/Common/FileUtils.cs diff --git a/src/benchmarks/micro/corefx/CommonUtils/PerfUtils.cs b/src/benchmarks/micro/libraries/CommonUtils/PerfUtils.cs similarity index 100% rename from src/benchmarks/micro/corefx/CommonUtils/PerfUtils.cs rename to src/benchmarks/micro/libraries/CommonUtils/PerfUtils.cs diff --git a/src/benchmarks/micro/corefx/System.Buffers/ArrayPoolTests.cs b/src/benchmarks/micro/libraries/System.Buffers/ArrayPoolTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Buffers/ArrayPoolTests.cs rename to src/benchmarks/micro/libraries/System.Buffers/ArrayPoolTests.cs diff --git a/src/benchmarks/micro/corefx/System.Buffers/Base64Tests.cs b/src/benchmarks/micro/libraries/System.Buffers/Base64Tests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Buffers/Base64Tests.cs rename to src/benchmarks/micro/libraries/System.Buffers/Base64Tests.cs diff --git a/src/benchmarks/micro/corefx/System.Buffers/BinaryReadAndWriteTests.cs b/src/benchmarks/micro/libraries/System.Buffers/BinaryReadAndWriteTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Buffers/BinaryReadAndWriteTests.cs rename to src/benchmarks/micro/libraries/System.Buffers/BinaryReadAndWriteTests.cs diff --git a/src/benchmarks/micro/corefx/System.Buffers/ReadOnlySequenceTests.cs b/src/benchmarks/micro/libraries/System.Buffers/ReadOnlySequenceTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Buffers/ReadOnlySequenceTests.cs rename to src/benchmarks/micro/libraries/System.Buffers/ReadOnlySequenceTests.cs diff --git a/src/benchmarks/micro/corefx/System.Buffers/Utf8FormatterTests.cs b/src/benchmarks/micro/libraries/System.Buffers/Utf8FormatterTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Buffers/Utf8FormatterTests.cs rename to src/benchmarks/micro/libraries/System.Buffers/Utf8FormatterTests.cs diff --git a/src/benchmarks/micro/corefx/System.Buffers/Utf8ParserTests.cs b/src/benchmarks/micro/libraries/System.Buffers/Utf8ParserTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Buffers/Utf8ParserTests.cs rename to src/benchmarks/micro/libraries/System.Buffers/Utf8ParserTests.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Add/AddGivenSize.cs b/src/benchmarks/micro/libraries/System.Collections/Add/AddGivenSize.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Add/AddGivenSize.cs rename to src/benchmarks/micro/libraries/System.Collections/Add/AddGivenSize.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Add/TryAddDefaultSize.cs b/src/benchmarks/micro/libraries/System.Collections/Add/TryAddDefaultSize.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Add/TryAddDefaultSize.cs rename to src/benchmarks/micro/libraries/System.Collections/Add/TryAddDefaultSize.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Add/TryAddGivenSize.cs b/src/benchmarks/micro/libraries/System.Collections/Add/TryAddGivenSize.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Add/TryAddGivenSize.cs rename to src/benchmarks/micro/libraries/System.Collections/Add/TryAddGivenSize.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/AddRemove/AddRemoveSteadyState.cs b/src/benchmarks/micro/libraries/System.Collections/AddRemove/AddRemoveSteadyState.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/AddRemove/AddRemoveSteadyState.cs rename to src/benchmarks/micro/libraries/System.Collections/AddRemove/AddRemoveSteadyState.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs rename to src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Concurrent/AddRemoveFromSameThreads.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromSameThreads.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Concurrent/AddRemoveFromSameThreads.cs rename to src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromSameThreads.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Concurrent/Count.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/Count.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Concurrent/Count.cs rename to src/benchmarks/micro/libraries/System.Collections/Concurrent/Count.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Concurrent/IsEmpty.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/IsEmpty.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Concurrent/IsEmpty.cs rename to src/benchmarks/micro/libraries/System.Collections/Concurrent/IsEmpty.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Contains/ContainsFalse.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsFalse.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Contains/ContainsFalse.cs rename to src/benchmarks/micro/libraries/System.Collections/Contains/ContainsFalse.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Contains/ContainsKeyFalse.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyFalse.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Contains/ContainsKeyFalse.cs rename to src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyFalse.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Contains/ContainsKeyTrue.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyTrue.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Contains/ContainsKeyTrue.cs rename to src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyTrue.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Contains/ContainsTrue.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsTrue.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Contains/ContainsTrue.cs rename to src/benchmarks/micro/libraries/System.Collections/Contains/ContainsTrue.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/CopyTo.cs b/src/benchmarks/micro/libraries/System.Collections/CopyTo.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/CopyTo.cs rename to src/benchmarks/micro/libraries/System.Collections/CopyTo.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Create/CtorDefaultSize.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSize.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Create/CtorDefaultSize.cs rename to src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSize.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Create/CtorDefaultSizeNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSizeNonGeneric.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Create/CtorDefaultSizeNonGeneric.cs rename to src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSizeNonGeneric.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Create/CtorFromCollection.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollection.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Create/CtorFromCollection.cs rename to src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollection.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Create/CtorFromCollectionNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollectionNonGeneric.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Create/CtorFromCollectionNonGeneric.cs rename to src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollectionNonGeneric.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Create/CtorGivenSize.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSize.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Create/CtorGivenSize.cs rename to src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSize.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Create/CtorGivenSizeNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSizeNonGeneric.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Create/CtorGivenSizeNonGeneric.cs rename to src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSizeNonGeneric.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/CreateAddAndClear.cs b/src/benchmarks/micro/libraries/System.Collections/CreateAddAndClear.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/CreateAddAndClear.cs rename to src/benchmarks/micro/libraries/System.Collections/CreateAddAndClear.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/CreateAddAndRemove.cs b/src/benchmarks/micro/libraries/System.Collections/CreateAddAndRemove.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/CreateAddAndRemove.cs rename to src/benchmarks/micro/libraries/System.Collections/CreateAddAndRemove.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Dictionary/DictionarySequentialKeys.cs b/src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Dictionary/DictionarySequentialKeys.cs rename to src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Dictionary/Perf_Dictionary.cs b/src/benchmarks/micro/libraries/System.Collections/Dictionary/Perf_Dictionary.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Dictionary/Perf_Dictionary.cs rename to src/benchmarks/micro/libraries/System.Collections/Dictionary/Perf_Dictionary.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Indexer/IndexerSet.cs b/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSet.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Indexer/IndexerSet.cs rename to src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSet.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Indexer/IndexerSetReverse.cs b/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSetReverse.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Indexer/IndexerSetReverse.cs rename to src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSetReverse.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Iterate/IterateFor.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateFor.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Iterate/IterateFor.cs rename to src/benchmarks/micro/libraries/System.Collections/Iterate/IterateFor.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Iterate/IterateForEach.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEach.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Iterate/IterateForEach.cs rename to src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEach.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Iterate/IterateForEachNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEachNonGeneric.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Iterate/IterateForEachNonGeneric.cs rename to src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEachNonGeneric.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Iterate/IterateForNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForNonGeneric.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Iterate/IterateForNonGeneric.cs rename to src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForNonGeneric.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Perf.BitArray.cs b/src/benchmarks/micro/libraries/System.Collections/Perf.BitArray.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Perf.BitArray.cs rename to src/benchmarks/micro/libraries/System.Collections/Perf.BitArray.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Sort.Types.cs b/src/benchmarks/micro/libraries/System.Collections/Sort.Types.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Sort.Types.cs rename to src/benchmarks/micro/libraries/System.Collections/Sort.Types.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Sort.cs b/src/benchmarks/micro/libraries/System.Collections/Sort.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Sort.cs rename to src/benchmarks/micro/libraries/System.Collections/Sort.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/SortedSet/Perf_SortedSet.cs b/src/benchmarks/micro/libraries/System.Collections/SortedSet/Perf_SortedSet.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/SortedSet/Perf_SortedSet.cs rename to src/benchmarks/micro/libraries/System.Collections/SortedSet/Perf_SortedSet.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/TryGetValue/TryGetValueFalse.cs b/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueFalse.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/TryGetValue/TryGetValueFalse.cs rename to src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueFalse.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/TryGetValue/TryGetValueTrue.cs b/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueTrue.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/TryGetValue/TryGetValueTrue.cs rename to src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueTrue.cs diff --git a/src/benchmarks/micro/corefx/System.Collections/Utils.cs b/src/benchmarks/micro/libraries/System.Collections/Utils.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Collections/Utils.cs rename to src/benchmarks/micro/libraries/System.Collections/Utils.cs diff --git a/src/benchmarks/micro/corefx/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs b/src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs rename to src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs diff --git a/src/benchmarks/micro/corefx/System.ComponentModel.TypeConverter/SampleClasses.cs b/src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/SampleClasses.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.ComponentModel.TypeConverter/SampleClasses.cs rename to src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/SampleClasses.cs diff --git a/src/benchmarks/micro/corefx/System.Console/Perf.Console.cs b/src/benchmarks/micro/libraries/System.Console/Perf.Console.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Console/Perf.Console.cs rename to src/benchmarks/micro/libraries/System.Console/Perf.Console.cs diff --git a/src/benchmarks/micro/corefx/System.Diagnostics/Perf_Process.cs b/src/benchmarks/micro/libraries/System.Diagnostics/Perf_Process.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Diagnostics/Perf_Process.cs rename to src/benchmarks/micro/libraries/System.Diagnostics/Perf_Process.cs diff --git a/src/benchmarks/micro/corefx/System.Drawing/Perf_Color.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Color.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Drawing/Perf_Color.cs rename to src/benchmarks/micro/libraries/System.Drawing/Perf_Color.cs diff --git a/src/benchmarks/micro/corefx/System.Drawing/Perf_Graphics_DrawBeziers.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Drawing/Perf_Graphics_DrawBeziers.cs rename to src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs diff --git a/src/benchmarks/micro/corefx/System.Drawing/Perf_Graphics_Transforms.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_Transforms.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Drawing/Perf_Graphics_Transforms.cs rename to src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_Transforms.cs diff --git a/src/benchmarks/micro/corefx/System.Drawing/Perf_Image_Load.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Image_Load.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Drawing/Perf_Image_Load.cs rename to src/benchmarks/micro/libraries/System.Drawing/Perf_Image_Load.cs diff --git a/src/benchmarks/micro/corefx/System.Globalization/Perf.CultureInfo.cs b/src/benchmarks/micro/libraries/System.Globalization/Perf.CultureInfo.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Globalization/Perf.CultureInfo.cs rename to src/benchmarks/micro/libraries/System.Globalization/Perf.CultureInfo.cs diff --git a/src/benchmarks/micro/corefx/System.Globalization/Perf.DateTimeCultureInfo.cs b/src/benchmarks/micro/libraries/System.Globalization/Perf.DateTimeCultureInfo.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Globalization/Perf.DateTimeCultureInfo.cs rename to src/benchmarks/micro/libraries/System.Globalization/Perf.DateTimeCultureInfo.cs diff --git a/src/benchmarks/micro/corefx/System.Globalization/Perf.NumberCultureInfo.cs b/src/benchmarks/micro/libraries/System.Globalization/Perf.NumberCultureInfo.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Globalization/Perf.NumberCultureInfo.cs rename to src/benchmarks/micro/libraries/System.Globalization/Perf.NumberCultureInfo.cs diff --git a/src/benchmarks/micro/corefx/System.Globalization/StringEquality.cs b/src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Globalization/StringEquality.cs rename to src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs diff --git a/src/benchmarks/micro/corefx/System.Globalization/StringHash.cs b/src/benchmarks/micro/libraries/System.Globalization/StringHash.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Globalization/StringHash.cs rename to src/benchmarks/micro/libraries/System.Globalization/StringHash.cs diff --git a/src/benchmarks/micro/corefx/System.Globalization/StringSearch.cs b/src/benchmarks/micro/libraries/System.Globalization/StringSearch.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Globalization/StringSearch.cs rename to src/benchmarks/micro/libraries/System.Globalization/StringSearch.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Compression/Brotli.cs b/src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Compression/Brotli.cs rename to src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Compression/CompressedFile.cs b/src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Compression/CompressedFile.cs rename to src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Compression/CompressionStreamPerfTestBase.cs b/src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Compression/CompressionStreamPerfTestBase.cs rename to src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Compression/TestData/TestDocument.pdf b/src/benchmarks/micro/libraries/System.IO.Compression/TestData/TestDocument.pdf similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Compression/TestData/TestDocument.pdf rename to src/benchmarks/micro/libraries/System.IO.Compression/TestData/TestDocument.pdf diff --git a/src/benchmarks/micro/corefx/System.IO.Compression/TestData/alice29.txt b/src/benchmarks/micro/libraries/System.IO.Compression/TestData/alice29.txt similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Compression/TestData/alice29.txt rename to src/benchmarks/micro/libraries/System.IO.Compression/TestData/alice29.txt diff --git a/src/benchmarks/micro/corefx/System.IO.Compression/TestData/sum b/src/benchmarks/micro/libraries/System.IO.Compression/TestData/sum similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Compression/TestData/sum rename to src/benchmarks/micro/libraries/System.IO.Compression/TestData/sum diff --git a/src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.Directory.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.Directory.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.Directory.cs rename to src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.Directory.cs diff --git a/src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.File.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.File.cs rename to src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs diff --git a/src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.FileInfo.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileInfo.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.FileInfo.cs rename to src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileInfo.cs diff --git a/src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.FileStream.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.FileSystem/Perf.FileStream.cs rename to src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs diff --git a/src/benchmarks/micro/corefx/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs b/src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs rename to src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs diff --git a/src/benchmarks/micro/corefx/System.IO.MemoryMappedFiles/TempFile.cs b/src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/TempFile.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.MemoryMappedFiles/TempFile.cs rename to src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/TempFile.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Pipelines/Perf.Pipe.cs b/src/benchmarks/micro/libraries/System.IO.Pipelines/Perf.Pipe.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Pipelines/Perf.Pipe.cs rename to src/benchmarks/micro/libraries/System.IO.Pipelines/Perf.Pipe.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Pipelines/PipeThroughputBenchmark.cs b/src/benchmarks/micro/libraries/System.IO.Pipelines/PipeThroughputBenchmark.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Pipelines/PipeThroughputBenchmark.cs rename to src/benchmarks/micro/libraries/System.IO.Pipelines/PipeThroughputBenchmark.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Pipes/Perf.AnonymousPipeStream.cs b/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.AnonymousPipeStream.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Pipes/Perf.AnonymousPipeStream.cs rename to src/benchmarks/micro/libraries/System.IO.Pipes/Perf.AnonymousPipeStream.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Pipes/Perf.NamedPipeStream.cs b/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.NamedPipeStream.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Pipes/Perf.NamedPipeStream.cs rename to src/benchmarks/micro/libraries/System.IO.Pipes/Perf.NamedPipeStream.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Pipes/Perf.PipeTest.cs b/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.PipeTest.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Pipes/Perf.PipeTest.cs rename to src/benchmarks/micro/libraries/System.IO.Pipes/Perf.PipeTest.cs diff --git a/src/benchmarks/micro/corefx/System.IO.Pipes/PipeTestBase.cs b/src/benchmarks/micro/libraries/System.IO.Pipes/PipeTestBase.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.IO.Pipes/PipeTestBase.cs rename to src/benchmarks/micro/libraries/System.IO.Pipes/PipeTestBase.cs diff --git a/src/benchmarks/micro/corefx/System.Linq/LinqTestData.cs b/src/benchmarks/micro/libraries/System.Linq/LinqTestData.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Linq/LinqTestData.cs rename to src/benchmarks/micro/libraries/System.Linq/LinqTestData.cs diff --git a/src/benchmarks/micro/corefx/System.Linq/Perf.Enumerable.cs b/src/benchmarks/micro/libraries/System.Linq/Perf.Enumerable.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Linq/Perf.Enumerable.cs rename to src/benchmarks/micro/libraries/System.Linq/Perf.Enumerable.cs diff --git a/src/benchmarks/micro/corefx/System.Linq/Perf.OrderBy.cs b/src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Linq/Perf.OrderBy.cs rename to src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/Constructors.cs b/src/benchmarks/micro/libraries/System.Memory/Constructors.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/Constructors.cs rename to src/benchmarks/micro/libraries/System.Memory/Constructors.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/Memory.cs b/src/benchmarks/micro/libraries/System.Memory/Memory.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/Memory.cs rename to src/benchmarks/micro/libraries/System.Memory/Memory.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/MemoryMarshal.cs b/src/benchmarks/micro/libraries/System.Memory/MemoryMarshal.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/MemoryMarshal.cs rename to src/benchmarks/micro/libraries/System.Memory/MemoryMarshal.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/ReadOnlyMemory.cs b/src/benchmarks/micro/libraries/System.Memory/ReadOnlyMemory.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/ReadOnlyMemory.cs rename to src/benchmarks/micro/libraries/System.Memory/ReadOnlyMemory.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/ReadOnlySequence.cs b/src/benchmarks/micro/libraries/System.Memory/ReadOnlySequence.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/ReadOnlySequence.cs rename to src/benchmarks/micro/libraries/System.Memory/ReadOnlySequence.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/ReadOnlySpan.cs b/src/benchmarks/micro/libraries/System.Memory/ReadOnlySpan.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/ReadOnlySpan.cs rename to src/benchmarks/micro/libraries/System.Memory/ReadOnlySpan.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/SequenceReader.cs b/src/benchmarks/micro/libraries/System.Memory/SequenceReader.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/SequenceReader.cs rename to src/benchmarks/micro/libraries/System.Memory/SequenceReader.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/Slice.cs b/src/benchmarks/micro/libraries/System.Memory/Slice.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/Slice.cs rename to src/benchmarks/micro/libraries/System.Memory/Slice.cs diff --git a/src/benchmarks/micro/corefx/System.Memory/Span.cs b/src/benchmarks/micro/libraries/System.Memory/Span.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Memory/Span.cs rename to src/benchmarks/micro/libraries/System.Memory/Span.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Http/Configuration.Certificates.cs b/src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Http/Configuration.Certificates.cs rename to src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Http/Perf.SocketsHttpHandler.cs b/src/benchmarks/micro/libraries/System.Net.Http/Perf.SocketsHttpHandler.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Http/Perf.SocketsHttpHandler.cs rename to src/benchmarks/micro/libraries/System.Net.Http/Perf.SocketsHttpHandler.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Http/testclienteku.contoso.com.pfx b/src/benchmarks/micro/libraries/System.Net.Http/testclienteku.contoso.com.pfx similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Http/testclienteku.contoso.com.pfx rename to src/benchmarks/micro/libraries/System.Net.Http/testclienteku.contoso.com.pfx diff --git a/src/benchmarks/micro/corefx/System.Net.Http/testservereku.contoso.com.pfx b/src/benchmarks/micro/libraries/System.Net.Http/testservereku.contoso.com.pfx similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Http/testservereku.contoso.com.pfx rename to src/benchmarks/micro/libraries/System.Net.Http/testservereku.contoso.com.pfx diff --git a/src/benchmarks/micro/corefx/System.Net.NetworkInformation/NetworkInterfaceTests.cs b/src/benchmarks/micro/libraries/System.Net.NetworkInformation/NetworkInterfaceTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.NetworkInformation/NetworkInterfaceTests.cs rename to src/benchmarks/micro/libraries/System.Net.NetworkInformation/NetworkInterfaceTests.cs diff --git a/src/benchmarks/micro/corefx/System.Net.NetworkInformation/PhysicalAddressTests.cs b/src/benchmarks/micro/libraries/System.Net.NetworkInformation/PhysicalAddressTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.NetworkInformation/PhysicalAddressTests.cs rename to src/benchmarks/micro/libraries/System.Net.NetworkInformation/PhysicalAddressTests.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Primitives/CredentialCacheTests.cs b/src/benchmarks/micro/libraries/System.Net.Primitives/CredentialCacheTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Primitives/CredentialCacheTests.cs rename to src/benchmarks/micro/libraries/System.Net.Primitives/CredentialCacheTests.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Primitives/DnsTests.cs b/src/benchmarks/micro/libraries/System.Net.Primitives/DnsTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Primitives/DnsTests.cs rename to src/benchmarks/micro/libraries/System.Net.Primitives/DnsTests.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Primitives/IPAddressPerformanceTests.cs b/src/benchmarks/micro/libraries/System.Net.Primitives/IPAddressPerformanceTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Primitives/IPAddressPerformanceTests.cs rename to src/benchmarks/micro/libraries/System.Net.Primitives/IPAddressPerformanceTests.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Security/SslStreamTests.cs b/src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Security/SslStreamTests.cs rename to src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs diff --git a/src/benchmarks/micro/corefx/System.Net.Sockets/Perf.Socket.SendReceive.cs b/src/benchmarks/micro/libraries/System.Net.Sockets/Perf.Socket.SendReceive.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Net.Sockets/Perf.Socket.SendReceive.cs rename to src/benchmarks/micro/libraries/System.Net.Sockets/Perf.Socket.SendReceive.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/GenericVectorConstructorTests.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorConstructorTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/GenericVectorConstructorTests.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorConstructorTests.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/GenericVectorFromSpanConstructorTests.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorFromSpanConstructorTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/GenericVectorFromSpanConstructorTests.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorFromSpanConstructorTests.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/Perf_Vector2.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector2.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/Perf_Vector2.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector2.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/Perf_Vector3.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector3.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/Perf_Vector3.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector3.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/Perf_Vector4.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector4.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/Perf_Vector4.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector4.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/Util.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Util.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/Util.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/Util.cs diff --git a/src/benchmarks/micro/corefx/System.Numerics.Vectors/VectorTests.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/VectorTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Numerics.Vectors/VectorTests.cs rename to src/benchmarks/micro/libraries/System.Numerics.Vectors/VectorTests.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Convert.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Convert.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Convert.cs rename to src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Convert.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Environment.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Environment.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Environment.cs rename to src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Environment.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Path.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Path.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Path.cs rename to src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Path.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Random.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Random.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.Random.cs rename to src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Random.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.StreamWriter.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.StreamWriter.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.StreamWriter.cs rename to src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.StreamWriter.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.WebUtility.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.WebUtility.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Extensions/Perf.WebUtility.cs rename to src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.WebUtility.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.InteropServices/SafeHandleTests.cs b/src/benchmarks/micro/libraries/System.Runtime.InteropServices/SafeHandleTests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.InteropServices/SafeHandleTests.cs rename to src/benchmarks/micro/libraries/System.Runtime.InteropServices/SafeHandleTests.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Numerics/Perf.BigInteger.cs b/src/benchmarks/micro/libraries/System.Runtime.Numerics/Perf.BigInteger.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Numerics/Perf.BigInteger.cs rename to src/benchmarks/micro/libraries/System.Runtime.Numerics/Perf.BigInteger.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs b/src/benchmarks/micro/libraries/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs rename to src/benchmarks/micro/libraries/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Array.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Array.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Array.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Array.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Boolean.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Boolean.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Boolean.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Boolean.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Byte.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Byte.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Byte.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Byte.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Char.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Char.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Char.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Char.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.DateTime.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTime.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.DateTime.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.DateTime.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.DateTimeOffset.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTimeOffset.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.DateTimeOffset.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.DateTimeOffset.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Decimal.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Decimal.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Decimal.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Decimal.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Double.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Double.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Double.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Double.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Enum.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Enum.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Enum.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Enum.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Guid.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Guid.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Guid.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Guid.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.HashCode.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.HashCode.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.HashCode.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.HashCode.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Int16.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int16.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Int16.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Int16.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Int32.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int32.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Int32.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Int32.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Int64.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int64.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Int64.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Int64.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.IntPtr.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.IntPtr.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.IntPtr.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.IntPtr.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Lazy.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Lazy.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Lazy.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Lazy.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Object.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Object.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Object.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Object.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.SByte.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.SByte.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.SByte.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.SByte.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Single.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Single.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Single.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Single.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.String.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.String.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.String.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.String.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.TimeSpan.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.TimeSpan.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.TimeSpan.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.TimeSpan.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Type.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Type.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Type.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Type.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.UInt16.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt16.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.UInt16.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.UInt16.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.UInt32.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt32.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.UInt32.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.UInt32.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.UInt64.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt64.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.UInt64.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.UInt64.cs diff --git a/src/benchmarks/micro/corefx/System.Runtime/Perf.Uri.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Uri.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Runtime/Perf.Uri.cs rename to src/benchmarks/micro/libraries/System.Runtime/Perf.Uri.cs diff --git a/src/benchmarks/micro/corefx/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs rename to src/benchmarks/micro/libraries/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs diff --git a/src/benchmarks/micro/corefx/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs rename to src/benchmarks/micro/libraries/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs diff --git a/src/benchmarks/micro/corefx/System.Security.Cryptography/Perf.CryptoConfig.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.CryptoConfig.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Security.Cryptography/Perf.CryptoConfig.cs rename to src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.CryptoConfig.cs diff --git a/src/benchmarks/micro/corefx/System.Security.Cryptography/Perf.Hashing.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Hashing.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Security.Cryptography/Perf.Hashing.cs rename to src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Hashing.cs diff --git a/src/benchmarks/micro/corefx/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs rename to src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Encoding/Perf.Encoding.cs b/src/benchmarks/micro/libraries/System.Text.Encoding/Perf.Encoding.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Encoding/Perf.Encoding.cs rename to src/benchmarks/micro/libraries/System.Text.Encoding/Perf.Encoding.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/JsonStrings.Designer.cs b/src/benchmarks/micro/libraries/System.Text.Json/Resources/JsonStrings.Designer.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/JsonStrings.Designer.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/JsonStrings.Designer.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/JsonStrings.resx b/src/benchmarks/micro/libraries/System.Text.Json/Resources/JsonStrings.resx similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/JsonStrings.resx rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/JsonStrings.resx diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.cs.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.cs.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.cs.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.cs.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.de.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.de.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.de.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.de.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.es.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.es.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.es.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.es.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.fr.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.fr.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.fr.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.fr.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.it.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.it.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.it.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.it.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.ja.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.ja.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.ja.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.ja.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.ko.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.ko.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.ko.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.ko.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.pl.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.pl.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.pl.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.pl.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.pt-BR.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.pt-BR.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.pt-BR.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.pt-BR.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.ru.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.ru.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.ru.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.ru.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.tr.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.tr.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.tr.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.tr.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.zh-Hans.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.zh-Hans.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.zh-Hans.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.zh-Hans.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.zh-Hant.xlf b/src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.zh-Hant.xlf similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Resources/xlf/JsonStrings.zh-Hant.xlf rename to src/benchmarks/micro/libraries/System.Text.Json/Resources/xlf/JsonStrings.zh-Hant.xlf diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Serializer/ReadJson.cs b/src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadJson.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Serializer/ReadJson.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadJson.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Serializer/WriteJson.cs b/src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Serializer/WriteJson.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Base64.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Base64.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Depth.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Depth.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Reader.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Reader.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Segment.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Segment.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Perf.Segment.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Segment.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs diff --git a/src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs rename to src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs diff --git a/src/benchmarks/micro/corefx/System.Text.RegularExpressions/Perf.Regex.Cache.cs b/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.RegularExpressions/Perf.Regex.Cache.cs rename to src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs diff --git a/src/benchmarks/micro/corefx/System.Text.RegularExpressions/Perf.Regex.Common.cs b/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Common.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text.RegularExpressions/Perf.Regex.Common.cs rename to src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Common.cs diff --git a/src/benchmarks/micro/corefx/System.Text/Perf.StringBuilder.cs b/src/benchmarks/micro/libraries/System.Text/Perf.StringBuilder.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Text/Perf.StringBuilder.cs rename to src/benchmarks/micro/libraries/System.Text/Perf.StringBuilder.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.Channels/Perf.Channel.cs b/src/benchmarks/micro/libraries/System.Threading.Channels/Perf.Channel.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.Channels/Perf.Channel.cs rename to src/benchmarks/micro/libraries/System.Threading.Channels/Perf.Channel.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.Tasks.Extensions/ManualResetValueTaskSource.cs b/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/ManualResetValueTaskSource.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.Tasks.Extensions/ManualResetValueTaskSource.cs rename to src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/ManualResetValueTaskSource.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.Tasks.Extensions/ManualResetValueTaskSourceFactory.cs b/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/ManualResetValueTaskSourceFactory.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.Tasks.Extensions/ManualResetValueTaskSourceFactory.cs rename to src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/ManualResetValueTaskSourceFactory.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.Tasks.Extensions/Perf.ValueTask.cs b/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.Tasks.Extensions/Perf.ValueTask.cs rename to src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.Tasks/Perf.AsyncMethods.cs b/src/benchmarks/micro/libraries/System.Threading.Tasks/Perf.AsyncMethods.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.Tasks/Perf.AsyncMethods.cs rename to src/benchmarks/micro/libraries/System.Threading.Tasks/Perf.AsyncMethods.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.ThreadPool/Perf.ThreadPool.cs b/src/benchmarks/micro/libraries/System.Threading.ThreadPool/Perf.ThreadPool.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.ThreadPool/Perf.ThreadPool.cs rename to src/benchmarks/micro/libraries/System.Threading.ThreadPool/Perf.ThreadPool.cs diff --git a/src/benchmarks/micro/corefx/System.Threading.Timers/Perf.Timer.cs b/src/benchmarks/micro/libraries/System.Threading.Timers/Perf.Timer.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading.Timers/Perf.Timer.cs rename to src/benchmarks/micro/libraries/System.Threading.Timers/Perf.Timer.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.CancellationToken.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.CancellationToken.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.CancellationToken.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.CancellationToken.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.EventWaitHandle.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.EventWaitHandle.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.EventWaitHandle.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.EventWaitHandle.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.Interlocked.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Interlocked.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.Interlocked.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.Interlocked.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.Lock.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Lock.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.Lock.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.Lock.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.Monitor.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Monitor.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.Monitor.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.Monitor.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.SpinLock.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.SpinLock.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.SpinLock.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.SpinLock.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.Thread.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Thread.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.Thread.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.Thread.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.ThreadStatic.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.ThreadStatic.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.ThreadStatic.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.ThreadStatic.cs diff --git a/src/benchmarks/micro/corefx/System.Threading/Perf.Volatile.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Volatile.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Threading/Perf.Volatile.cs rename to src/benchmarks/micro/libraries/System.Threading/Perf.Volatile.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XDocument.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XDocument.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XDocument.cs rename to src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XDocument.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XElement.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElement.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XElement.cs rename to src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElement.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XElementList.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElementList.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XElementList.cs rename to src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElementList.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XName.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XName.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.Linq/Perf.XName.cs rename to src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XName.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.XmlDocument/Perf.XmlDocument.cs b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlDocument.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.XmlDocument/Perf.XmlDocument.cs rename to src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlDocument.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.XmlDocument/Perf.XmlNode.cs b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNode.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.XmlDocument/Perf.XmlNode.cs rename to src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNode.cs diff --git a/src/benchmarks/micro/corefx/System.Xml.XmlDocument/Perf.XmlNodeList.cs b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNodeList.cs similarity index 100% rename from src/benchmarks/micro/corefx/System.Xml.XmlDocument/Perf.XmlNodeList.cs rename to src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNodeList.cs diff --git a/src/benchmarks/micro/corefx/System/Hashing.cs b/src/benchmarks/micro/libraries/System/Hashing.cs similarity index 100% rename from src/benchmarks/micro/corefx/System/Hashing.cs rename to src/benchmarks/micro/libraries/System/Hashing.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/InputFileHelper.cs b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/InputFileHelper.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/NucleotideHelpers.cs b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/NucleotideHelpers.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/NucleotideHelpers.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/NucleotideHelpers.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/RegexReduxHelpers.cs b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/RegexReduxHelpers.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/RegexReduxHelpers.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/RegexReduxHelpers.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/ReverseComplementHelpers.cs b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/ReverseComplementHelpers.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/ReverseComplementHelpers.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/ReverseComplementHelpers.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input-big.txt b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input-big.txt similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input-big.txt rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input-big.txt diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input.txt b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input.txt similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input.txt rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input.txt diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25.txt b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25.txt similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25.txt rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25.txt diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25000.txt b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25000.txt similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25000.txt rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25000.txt diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25.txt b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25.txt similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25.txt rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25.txt diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25000.txt b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25000.txt similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25000.txt rename to src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25000.txt diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/binarytrees-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/binarytrees-2.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-2.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/binarytrees-5.cs b/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-5.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/binarytrees-5.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-5.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/fannkuch-redux-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/fannkuch-redux-2.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-2.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/fannkuch-redux-5.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-5.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/fannkuch-redux-5.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-5.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/fasta-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/fasta-1.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/fasta-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/fasta-2.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/k-nucleotide-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-1.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/k-nucleotide-1.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-1.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/k-nucleotide-9.cs b/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-9.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/k-nucleotide-9.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-9.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/mandelbrot-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/mandelbrot-2.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-2.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/mandelbrot-7.cs b/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-7.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/mandelbrot-7.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-7.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/n-body-3.cs b/src/benchmarks/micro/runtime/BenchmarksGame/n-body-3.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/n-body-3.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/n-body-3.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/pidigits-3.cs b/src/benchmarks/micro/runtime/BenchmarksGame/pidigits-3.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/pidigits-3.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/pidigits-3.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/regex-redux-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-1.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/regex-redux-1.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-1.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/regex-redux-5.cs b/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-5.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/regex-redux-5.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-5.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/reverse-complement-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-1.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/reverse-complement-1.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-1.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/reverse-complement-6.cs b/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-6.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/reverse-complement-6.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-6.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/spectralnorm-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-1.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/spectralnorm-1.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-1.cs diff --git a/src/benchmarks/micro/coreclr/BenchmarksGame/spectralnorm-3.cs b/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-3.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BenchmarksGame/spectralnorm-3.cs rename to src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-3.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Adams.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Adams.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Adams.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Adams.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/BenchMk2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMk2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/BenchMk2.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMk2.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/BenchMrk.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMrk.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/BenchMrk.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMrk.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Bisect.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Bisect.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Bisect.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Bisect.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/DMath.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/DMath.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/DMath.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/DMath.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/FFT.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/FFT.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/InProd.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/InProd.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/InProd.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/InProd.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/InvMt.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/InvMt.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/InvMt.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/InvMt.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/LLoops.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/LLoops.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/LLoops.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/LLoops.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Lorenz.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Lorenz.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Lorenz.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Lorenz.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/MatInv4.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/MatInv4.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/MatInv4.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/MatInv4.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/NewtE.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtE.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/NewtE.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/NewtE.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/NewtR.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtR.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/NewtR.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/NewtR.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Regula.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Regula.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Regula.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Regula.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Romber.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Romber.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Romber.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Romber.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Secant.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Secant.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Secant.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Secant.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Simpsn.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Simpsn.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Simpsn.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Simpsn.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/SqMtx.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/SqMtx.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/SqMtx.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/SqMtx.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Trap.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Trap.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Trap.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Trap.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchF/Whetsto.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Whetsto.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchF/Whetsto.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchF/Whetsto.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/8Queens.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/8Queens.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/8Queens.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/8Queens.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Ackermann.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Ackermann.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Ackermann.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Ackermann.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/AddArray.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/AddArray.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/AddArray2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/AddArray2.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray2.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Array1.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Array1.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Array1.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Array1.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Array2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Array2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Array2.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Array2.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/BenchE.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/BenchE.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/BenchE.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/BenchE.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/BubbleSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/BubbleSort.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/BubbleSort2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/BubbleSort2.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort2.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/CSieve.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/CSieve.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/CSieve.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/CSieve.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Fib.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Fib.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/HeapSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/HeapSort.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/HeapSort.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/HeapSort.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/IniArray.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/IniArray.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/IniArray.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/IniArray.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/LogicArray.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/LogicArray.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/LogicArray.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/LogicArray.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Midpoint.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Midpoint.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Midpoint.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Midpoint.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/MulMatrix.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/MulMatrix.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/MulMatrix.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/MulMatrix.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/NDhrystone.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/NDhrystone.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/NDhrystone.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/NDhrystone.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Permutate.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Permutate.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Permutate.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Permutate.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Pi.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Pi.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/Puzzle.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Puzzle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/Puzzle.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/Puzzle.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/QuickSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/QuickSort.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/QuickSort.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/QuickSort.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/TreeInsert.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeInsert.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/TreeInsert.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/TreeInsert.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/TreeSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeSort.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/TreeSort.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/TreeSort.cs diff --git a/src/benchmarks/micro/coreclr/Benchstones/BenchI/XposMatrix.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/XposMatrix.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Benchstones/BenchI/XposMatrix.cs rename to src/benchmarks/micro/runtime/Benchstones/BenchI/XposMatrix.cs diff --git a/src/benchmarks/micro/coreclr/BilinearInterpol/BilinearInterpol.cs b/src/benchmarks/micro/runtime/BilinearInterpol/BilinearInterpol.cs similarity index 100% rename from src/benchmarks/micro/coreclr/BilinearInterpol/BilinearInterpol.cs rename to src/benchmarks/micro/runtime/BilinearInterpol/BilinearInterpol.cs diff --git a/src/benchmarks/micro/coreclr/Burgers/Burgers.cs b/src/benchmarks/micro/runtime/Burgers/Burgers.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Burgers/Burgers.cs rename to src/benchmarks/micro/runtime/Burgers/Burgers.cs diff --git a/src/benchmarks/micro/coreclr/Burgers/THIRD-PARTY-NOTICES b/src/benchmarks/micro/runtime/Burgers/THIRD-PARTY-NOTICES similarity index 100% rename from src/benchmarks/micro/coreclr/Burgers/THIRD-PARTY-NOTICES rename to src/benchmarks/micro/runtime/Burgers/THIRD-PARTY-NOTICES diff --git a/src/benchmarks/micro/coreclr/Bytemark/ByteMark.cs b/src/benchmarks/micro/runtime/Bytemark/ByteMark.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/ByteMark.cs rename to src/benchmarks/micro/runtime/Bytemark/ByteMark.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/Huffman.cs b/src/benchmarks/micro/runtime/Bytemark/Huffman.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/Huffman.cs rename to src/benchmarks/micro/runtime/Bytemark/Huffman.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/StringSort.cs b/src/benchmarks/micro/runtime/Bytemark/StringSort.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/StringSort.cs rename to src/benchmarks/micro/runtime/Bytemark/StringSort.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/THIRD-PARTY-NOTICES b/src/benchmarks/micro/runtime/Bytemark/THIRD-PARTY-NOTICES similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/THIRD-PARTY-NOTICES rename to src/benchmarks/micro/runtime/Bytemark/THIRD-PARTY-NOTICES diff --git a/src/benchmarks/micro/coreclr/Bytemark/assign_jagged.cs b/src/benchmarks/micro/runtime/Bytemark/assign_jagged.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/assign_jagged.cs rename to src/benchmarks/micro/runtime/Bytemark/assign_jagged.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/assign_rect.cs b/src/benchmarks/micro/runtime/Bytemark/assign_rect.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/assign_rect.cs rename to src/benchmarks/micro/runtime/Bytemark/assign_rect.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/bitops.cs b/src/benchmarks/micro/runtime/Bytemark/bitops.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/bitops.cs rename to src/benchmarks/micro/runtime/Bytemark/bitops.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/assignjagged.dat b/src/benchmarks/micro/runtime/Bytemark/commands/assignjagged.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/assignjagged.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/assignjagged.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/assignrect.dat b/src/benchmarks/micro/runtime/Bytemark/commands/assignrect.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/assignrect.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/assignrect.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/bitfield.dat b/src/benchmarks/micro/runtime/Bytemark/commands/bitfield.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/bitfield.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/bitfield.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/emfclass.dat b/src/benchmarks/micro/runtime/Bytemark/commands/emfclass.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/emfclass.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/emfclass.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/emfstruct.dat b/src/benchmarks/micro/runtime/Bytemark/commands/emfstruct.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/emfstruct.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/emfstruct.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/four.dat b/src/benchmarks/micro/runtime/Bytemark/commands/four.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/four.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/four.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/huff.dat b/src/benchmarks/micro/runtime/Bytemark/commands/huff.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/huff.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/huff.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/idea.dat b/src/benchmarks/micro/runtime/Bytemark/commands/idea.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/idea.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/idea.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/lu.dat b/src/benchmarks/micro/runtime/Bytemark/commands/lu.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/lu.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/lu.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/nnetjagged.dat b/src/benchmarks/micro/runtime/Bytemark/commands/nnetjagged.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/nnetjagged.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/nnetjagged.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/nnetrect.dat b/src/benchmarks/micro/runtime/Bytemark/commands/nnetrect.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/nnetrect.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/nnetrect.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/numsortjagged.dat b/src/benchmarks/micro/runtime/Bytemark/commands/numsortjagged.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/numsortjagged.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/numsortjagged.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/numsortrect.dat b/src/benchmarks/micro/runtime/Bytemark/commands/numsortrect.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/numsortrect.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/numsortrect.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/commands/stringsort.dat b/src/benchmarks/micro/runtime/Bytemark/commands/stringsort.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/commands/stringsort.dat rename to src/benchmarks/micro/runtime/Bytemark/commands/stringsort.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/emfloat.cs b/src/benchmarks/micro/runtime/Bytemark/emfloat.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/emfloat.cs rename to src/benchmarks/micro/runtime/Bytemark/emfloat.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/emfloatclass.cs b/src/benchmarks/micro/runtime/Bytemark/emfloatclass.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/emfloatclass.cs rename to src/benchmarks/micro/runtime/Bytemark/emfloatclass.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/fourier.cs b/src/benchmarks/micro/runtime/Bytemark/fourier.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/fourier.cs rename to src/benchmarks/micro/runtime/Bytemark/fourier.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/idea.cs b/src/benchmarks/micro/runtime/Bytemark/idea.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/idea.cs rename to src/benchmarks/micro/runtime/Bytemark/idea.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/ludecomp.cs b/src/benchmarks/micro/runtime/Bytemark/ludecomp.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/ludecomp.cs rename to src/benchmarks/micro/runtime/Bytemark/ludecomp.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/neural-dat.cs b/src/benchmarks/micro/runtime/Bytemark/neural-dat.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/neural-dat.cs rename to src/benchmarks/micro/runtime/Bytemark/neural-dat.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/neural.cs b/src/benchmarks/micro/runtime/Bytemark/neural.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/neural.cs rename to src/benchmarks/micro/runtime/Bytemark/neural.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/neuraljagged.cs b/src/benchmarks/micro/runtime/Bytemark/neuraljagged.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/neuraljagged.cs rename to src/benchmarks/micro/runtime/Bytemark/neuraljagged.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/nnet.dat b/src/benchmarks/micro/runtime/Bytemark/nnet.dat similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/nnet.dat rename to src/benchmarks/micro/runtime/Bytemark/nnet.dat diff --git a/src/benchmarks/micro/coreclr/Bytemark/numericsort.cs b/src/benchmarks/micro/runtime/Bytemark/numericsort.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/numericsort.cs rename to src/benchmarks/micro/runtime/Bytemark/numericsort.cs diff --git a/src/benchmarks/micro/coreclr/Bytemark/utility.cs b/src/benchmarks/micro/runtime/Bytemark/utility.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Bytemark/utility.cs rename to src/benchmarks/micro/runtime/Bytemark/utility.cs diff --git a/src/benchmarks/micro/coreclr/Devirtualization/Boxing.cs b/src/benchmarks/micro/runtime/Devirtualization/Boxing.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Devirtualization/Boxing.cs rename to src/benchmarks/micro/runtime/Devirtualization/Boxing.cs diff --git a/src/benchmarks/micro/coreclr/Devirtualization/DefaultEqualityComparerPerf.cs b/src/benchmarks/micro/runtime/Devirtualization/DefaultEqualityComparerPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Devirtualization/DefaultEqualityComparerPerf.cs rename to src/benchmarks/micro/runtime/Devirtualization/DefaultEqualityComparerPerf.cs diff --git a/src/benchmarks/micro/coreclr/Devirtualization/GuardedThreeClassInterface.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassInterface.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Devirtualization/GuardedThreeClassInterface.cs rename to src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassInterface.cs diff --git a/src/benchmarks/micro/coreclr/Devirtualization/GuardedThreeClassVirtual.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassVirtual.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Devirtualization/GuardedThreeClassVirtual.cs rename to src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassVirtual.cs diff --git a/src/benchmarks/micro/coreclr/Devirtualization/GuardedTwoClassInterface.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassInterface.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Devirtualization/GuardedTwoClassInterface.cs rename to src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassInterface.cs diff --git a/src/benchmarks/micro/coreclr/Devirtualization/GuardedTwoClassVirtual.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassVirtual.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Devirtualization/GuardedTwoClassVirtual.cs rename to src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassVirtual.cs diff --git a/src/benchmarks/micro/coreclr/Exceptions/Handling.cs b/src/benchmarks/micro/runtime/Exceptions/Handling.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Exceptions/Handling.cs rename to src/benchmarks/micro/runtime/Exceptions/Handling.cs diff --git a/src/benchmarks/micro/coreclr/FractalPerf/FractalPerf.cs b/src/benchmarks/micro/runtime/FractalPerf/FractalPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/FractalPerf/FractalPerf.cs rename to src/benchmarks/micro/runtime/FractalPerf/FractalPerf.cs diff --git a/src/benchmarks/micro/coreclr/Inlining/InlineGCStruct.cs b/src/benchmarks/micro/runtime/Inlining/InlineGCStruct.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Inlining/InlineGCStruct.cs rename to src/benchmarks/micro/runtime/Inlining/InlineGCStruct.cs diff --git a/src/benchmarks/micro/coreclr/Inlining/NoThrowInline.cs b/src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Inlining/NoThrowInline.cs rename to src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs diff --git a/src/benchmarks/micro/coreclr/Layout/SearchLoops.cs b/src/benchmarks/micro/runtime/Layout/SearchLoops.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Layout/SearchLoops.cs rename to src/benchmarks/micro/runtime/Layout/SearchLoops.cs diff --git a/src/benchmarks/micro/coreclr/Linq/Linq.cs b/src/benchmarks/micro/runtime/Linq/Linq.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Linq/Linq.cs rename to src/benchmarks/micro/runtime/Linq/Linq.cs diff --git a/src/benchmarks/micro/coreclr/Lowering/InstructionReplacement.cs b/src/benchmarks/micro/runtime/Lowering/InstructionReplacement.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Lowering/InstructionReplacement.cs rename to src/benchmarks/micro/runtime/Lowering/InstructionReplacement.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/DivRem.cs b/src/benchmarks/micro/runtime/Math/Functions/DivRem.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/DivRem.cs rename to src/benchmarks/micro/runtime/Math/Functions/DivRem.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/AbsDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/AbsDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/AbsDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/AbsDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/AcosDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/AcosDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/AcosDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/AcosDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Acosh.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Acosh.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Acosh.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Acosh.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/AsinDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/AsinDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/AsinDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/AsinDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Asinh.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Asinh.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Asinh.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Asinh.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Atan2Double.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Atan2Double.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Atan2Double.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Atan2Double.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/AtanDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/AtanDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/AtanDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/AtanDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Atanh.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Atanh.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Atanh.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Atanh.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Cbrt.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Cbrt.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Cbrt.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Cbrt.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/CeilingDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/CeilingDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/CeilingDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/CeilingDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/CosDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/CosDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/CosDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/CosDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/CoshDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/CoshDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/CoshDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/CoshDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/ExpDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/ExpDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/ExpDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/ExpDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/FloorDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/FloorDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/FloorDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/FloorDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/FusedMultiplyAdd.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/FusedMultiplyAdd.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/FusedMultiplyAdd.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/FusedMultiplyAdd.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/ILogB.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/ILogB.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/ILogB.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/ILogB.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Log10Double.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Log10Double.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Log10Double.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Log10Double.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/Log2.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/Log2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/Log2.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/Log2.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/LogDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/LogDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/LogDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/LogDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/PowDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/PowDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/PowDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/PowDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/RoundDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/RoundDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/RoundDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/RoundDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/ScaleB.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/ScaleB.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/ScaleB.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/ScaleB.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/SinDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/SinDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/SinDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/SinDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/SinhDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/SinhDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/SinhDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/SinhDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/SqrtDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/SqrtDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/SqrtDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/SqrtDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/TanDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/TanDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/TanDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/TanDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Double/TanhDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/TanhDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Double/TanhDouble.cs rename to src/benchmarks/micro/runtime/Math/Functions/Double/TanhDouble.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/MathTests.cs b/src/benchmarks/micro/runtime/Math/Functions/MathTests.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/MathTests.cs rename to src/benchmarks/micro/runtime/Math/Functions/MathTests.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/AbsSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/AbsSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/AbsSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/AbsSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/AcosSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/AcosSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/AcosSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/AcosSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Acosh.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Acosh.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Acosh.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Acosh.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/AsinSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/AsinSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/AsinSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/AsinSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Asinh.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Asinh.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Asinh.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Asinh.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Atan2Single.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Atan2Single.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Atan2Single.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Atan2Single.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/AtanSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/AtanSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/AtanSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/AtanSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Atanh.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Atanh.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Atanh.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Atanh.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Cbrt.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Cbrt.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Cbrt.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Cbrt.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/CeilingSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/CeilingSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/CeilingSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/CeilingSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/CosSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/CosSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/CosSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/CosSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/CoshSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/CoshSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/CoshSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/CoshSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/ExpSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/ExpSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/ExpSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/ExpSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/FloorSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/FloorSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/FloorSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/FloorSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/FusedMultiplyAdd.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/FusedMultiplyAdd.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/FusedMultiplyAdd.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/FusedMultiplyAdd.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/ILogB.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/ILogB.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/ILogB.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/ILogB.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Log10Single.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Log10Single.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Log10Single.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Log10Single.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/Log2.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/Log2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/Log2.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/Log2.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/LogSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/LogSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/LogSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/LogSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/PowSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/PowSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/PowSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/PowSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/RoundSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/RoundSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/RoundSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/RoundSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/ScaleB.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/ScaleB.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/ScaleB.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/ScaleB.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/SinSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/SinSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/SinSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/SinSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/SinhSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/SinhSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/SinhSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/SinhSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/SqrtSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/SqrtSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/SqrtSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/SqrtSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/TanSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/TanSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/TanSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/TanSingle.cs diff --git a/src/benchmarks/micro/coreclr/Math/Functions/Single/TanhSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/TanhSingle.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Math/Functions/Single/TanhSingle.cs rename to src/benchmarks/micro/runtime/Math/Functions/Single/TanhSingle.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Camera.cs b/src/benchmarks/micro/runtime/PacketTracer/Camera.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Camera.cs rename to src/benchmarks/micro/runtime/PacketTracer/Camera.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Color.cs b/src/benchmarks/micro/runtime/PacketTracer/Color.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Color.cs rename to src/benchmarks/micro/runtime/PacketTracer/Color.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/ColorPacket.cs b/src/benchmarks/micro/runtime/PacketTracer/ColorPacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/ColorPacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/ColorPacket.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Intersections.cs b/src/benchmarks/micro/runtime/PacketTracer/Intersections.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Intersections.cs rename to src/benchmarks/micro/runtime/PacketTracer/Intersections.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/LightPacket.cs b/src/benchmarks/micro/runtime/PacketTracer/LightPacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/LightPacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/LightPacket.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/ObjectPacket.cs b/src/benchmarks/micro/runtime/PacketTracer/ObjectPacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/ObjectPacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/ObjectPacket.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/PacketTracer.cs b/src/benchmarks/micro/runtime/PacketTracer/PacketTracer.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/PacketTracer.cs rename to src/benchmarks/micro/runtime/PacketTracer/PacketTracer.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/PlanePacket.cs b/src/benchmarks/micro/runtime/PacketTracer/PlanePacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/PlanePacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/PlanePacket.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/RayPacket.cs b/src/benchmarks/micro/runtime/PacketTracer/RayPacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/RayPacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/RayPacket.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Render.cs b/src/benchmarks/micro/runtime/PacketTracer/Render.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Render.cs rename to src/benchmarks/micro/runtime/PacketTracer/Render.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Scene.cs b/src/benchmarks/micro/runtime/PacketTracer/Scene.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Scene.cs rename to src/benchmarks/micro/runtime/PacketTracer/Scene.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/SpherePacket.cs b/src/benchmarks/micro/runtime/PacketTracer/SpherePacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/SpherePacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/SpherePacket.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Surface.cs b/src/benchmarks/micro/runtime/PacketTracer/Surface.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Surface.cs rename to src/benchmarks/micro/runtime/PacketTracer/Surface.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Surfaces.cs b/src/benchmarks/micro/runtime/PacketTracer/Surfaces.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Surfaces.cs rename to src/benchmarks/micro/runtime/PacketTracer/Surfaces.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/Vector.cs b/src/benchmarks/micro/runtime/PacketTracer/Vector.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/Vector.cs rename to src/benchmarks/micro/runtime/PacketTracer/Vector.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/VectorMath.cs b/src/benchmarks/micro/runtime/PacketTracer/VectorMath.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/VectorMath.cs rename to src/benchmarks/micro/runtime/PacketTracer/VectorMath.cs diff --git a/src/benchmarks/micro/coreclr/PacketTracer/VectorPacket.cs b/src/benchmarks/micro/runtime/PacketTracer/VectorPacket.cs similarity index 100% rename from src/benchmarks/micro/coreclr/PacketTracer/VectorPacket.cs rename to src/benchmarks/micro/runtime/PacketTracer/VectorPacket.cs diff --git a/src/benchmarks/micro/coreclr/Roslyn/CscBench.cs b/src/benchmarks/micro/runtime/Roslyn/CscBench.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Roslyn/CscBench.cs rename to src/benchmarks/micro/runtime/Roslyn/CscBench.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/Abstractions.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/Abstractions.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/Abstractions.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/Abstractions.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/ConsoleMandel.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/ConsoleMandel.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/Interfaces.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/Interfaces.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/Interfaces.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/Interfaces.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/ScalarDouble.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ScalarDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/ScalarDouble.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ScalarDouble.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/ScalarFloat.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ScalarFloat.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/ScalarFloat.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ScalarFloat.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorDouble.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorDouble.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorDouble.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorDouble.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorDoubleStrict.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorDoubleStrict.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorDoubleStrict.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorDoubleStrict.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorFloat.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorFloat.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorFloat.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorFloat.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorFloatStrict.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorFloatStrict.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorFloatStrict.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorFloatStrict.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorHelpers.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorHelpers.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/ConsoleMandel/VectorHelpers.cs rename to src/benchmarks/micro/runtime/SIMD/ConsoleMandel/VectorHelpers.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Camera.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Camera.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Camera.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Camera.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Color.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Color.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Color.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Color.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/ISect.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/ISect.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/ISect.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/ISect.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Light.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Light.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Light.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Light.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/ObjectPool.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/ObjectPool.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/ObjectPool.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/ObjectPool.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Plane.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Plane.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Plane.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Plane.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/ProducerConsumerCollectionBase.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/ProducerConsumerCollectionBase.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/ProducerConsumerCollectionBase.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/ProducerConsumerCollectionBase.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Ray.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Ray.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Ray.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Ray.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/RayTracerBench.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/RayTracerBench.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/RayTracerBench.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/RayTracerBench.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Raytracer.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Raytracer.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Raytracer.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Raytracer.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Scene.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Scene.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Scene.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Scene.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/SceneObject.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/SceneObject.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/SceneObject.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/SceneObject.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Sphere.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Sphere.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Sphere.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Sphere.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Surface.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Surface.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Surface.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Surface.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Surfaces.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Surfaces.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Surfaces.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Surfaces.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/RayTracer/Vector.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/Vector.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/RayTracer/Vector.cs rename to src/benchmarks/micro/runtime/SIMD/RayTracer/Vector.cs diff --git a/src/benchmarks/micro/coreclr/SIMD/SeekUnroll/SeekUnroll.cs b/src/benchmarks/micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SIMD/SeekUnroll/SeekUnroll.cs rename to src/benchmarks/micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/Constants.cs b/src/benchmarks/micro/runtime/SciMark/Constants.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/Constants.cs rename to src/benchmarks/micro/runtime/SciMark/Constants.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/FFT.cs b/src/benchmarks/micro/runtime/SciMark/FFT.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/FFT.cs rename to src/benchmarks/micro/runtime/SciMark/FFT.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/LU.cs b/src/benchmarks/micro/runtime/SciMark/LU.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/LU.cs rename to src/benchmarks/micro/runtime/SciMark/LU.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/MonteCarlo.cs b/src/benchmarks/micro/runtime/SciMark/MonteCarlo.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/MonteCarlo.cs rename to src/benchmarks/micro/runtime/SciMark/MonteCarlo.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/Random.cs b/src/benchmarks/micro/runtime/SciMark/Random.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/Random.cs rename to src/benchmarks/micro/runtime/SciMark/Random.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/SOR.cs b/src/benchmarks/micro/runtime/SciMark/SOR.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/SOR.cs rename to src/benchmarks/micro/runtime/SciMark/SOR.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/SparseCompRow.cs b/src/benchmarks/micro/runtime/SciMark/SparseCompRow.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/SparseCompRow.cs rename to src/benchmarks/micro/runtime/SciMark/SparseCompRow.cs diff --git a/src/benchmarks/micro/coreclr/SciMark/THIRD-PARTY-NOTICES b/src/benchmarks/micro/runtime/SciMark/THIRD-PARTY-NOTICES similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/THIRD-PARTY-NOTICES rename to src/benchmarks/micro/runtime/SciMark/THIRD-PARTY-NOTICES diff --git a/src/benchmarks/micro/coreclr/SciMark/kernel.cs b/src/benchmarks/micro/runtime/SciMark/kernel.cs similarity index 100% rename from src/benchmarks/micro/coreclr/SciMark/kernel.cs rename to src/benchmarks/micro/runtime/SciMark/kernel.cs diff --git a/src/benchmarks/micro/coreclr/Span/Indexer.cs b/src/benchmarks/micro/runtime/Span/Indexer.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Span/Indexer.cs rename to src/benchmarks/micro/runtime/Span/Indexer.cs diff --git a/src/benchmarks/micro/coreclr/Span/Sorting.cs b/src/benchmarks/micro/runtime/Span/Sorting.cs similarity index 100% rename from src/benchmarks/micro/coreclr/Span/Sorting.cs rename to src/benchmarks/micro/runtime/Span/Sorting.cs diff --git a/src/benchmarks/micro/coreclr/System.Reflection/Activator.cs b/src/benchmarks/micro/runtime/System.Reflection/Activator.cs similarity index 100% rename from src/benchmarks/micro/coreclr/System.Reflection/Activator.cs rename to src/benchmarks/micro/runtime/System.Reflection/Activator.cs diff --git a/src/benchmarks/micro/coreclr/System.Reflection/Attributes.cs b/src/benchmarks/micro/runtime/System.Reflection/Attributes.cs similarity index 100% rename from src/benchmarks/micro/coreclr/System.Reflection/Attributes.cs rename to src/benchmarks/micro/runtime/System.Reflection/Attributes.cs diff --git a/src/benchmarks/micro/coreclr/V8/Crypto/Crypto.cs b/src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs similarity index 100% rename from src/benchmarks/micro/coreclr/V8/Crypto/Crypto.cs rename to src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs diff --git a/src/benchmarks/micro/coreclr/V8/Crypto/THIRD-PARTY-NOTICES b/src/benchmarks/micro/runtime/V8/Crypto/THIRD-PARTY-NOTICES similarity index 100% rename from src/benchmarks/micro/coreclr/V8/Crypto/THIRD-PARTY-NOTICES rename to src/benchmarks/micro/runtime/V8/Crypto/THIRD-PARTY-NOTICES diff --git a/src/benchmarks/micro/coreclr/V8/Richards/Richards.cs b/src/benchmarks/micro/runtime/V8/Richards/Richards.cs similarity index 100% rename from src/benchmarks/micro/coreclr/V8/Richards/Richards.cs rename to src/benchmarks/micro/runtime/V8/Richards/Richards.cs diff --git a/src/benchmarks/micro/coreclr/V8/Richards/THIRD-PARTY-NOTICES b/src/benchmarks/micro/runtime/V8/Richards/THIRD-PARTY-NOTICES similarity index 100% rename from src/benchmarks/micro/coreclr/V8/Richards/THIRD-PARTY-NOTICES rename to src/benchmarks/micro/runtime/V8/Richards/THIRD-PARTY-NOTICES diff --git a/src/benchmarks/micro/coreclr/perflab/BlockCopyPerf.cs b/src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/BlockCopyPerf.cs rename to src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs diff --git a/src/benchmarks/micro/coreclr/perflab/CastingPerf.cs b/src/benchmarks/micro/runtime/perflab/CastingPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/CastingPerf.cs rename to src/benchmarks/micro/runtime/perflab/CastingPerf.cs diff --git a/src/benchmarks/micro/coreclr/perflab/CastingPerf2.cs b/src/benchmarks/micro/runtime/perflab/CastingPerf2.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/CastingPerf2.cs rename to src/benchmarks/micro/runtime/perflab/CastingPerf2.cs diff --git a/src/benchmarks/micro/coreclr/perflab/DelegatePerf.cs b/src/benchmarks/micro/runtime/perflab/DelegatePerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/DelegatePerf.cs rename to src/benchmarks/micro/runtime/perflab/DelegatePerf.cs diff --git a/src/benchmarks/micro/coreclr/perflab/DictionaryExpansion.cs b/src/benchmarks/micro/runtime/perflab/DictionaryExpansion.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/DictionaryExpansion.cs rename to src/benchmarks/micro/runtime/perflab/DictionaryExpansion.cs diff --git a/src/benchmarks/micro/coreclr/perflab/EnumPerf.cs b/src/benchmarks/micro/runtime/perflab/EnumPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/EnumPerf.cs rename to src/benchmarks/micro/runtime/perflab/EnumPerf.cs diff --git a/src/benchmarks/micro/coreclr/perflab/LowLevelPerf.cs b/src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/LowLevelPerf.cs rename to src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs diff --git a/src/benchmarks/micro/coreclr/perflab/ReflectionPerf.cs b/src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/ReflectionPerf.cs rename to src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs diff --git a/src/benchmarks/micro/coreclr/perflab/StackWalk.cs b/src/benchmarks/micro/runtime/perflab/StackWalk.cs similarity index 100% rename from src/benchmarks/micro/coreclr/perflab/StackWalk.cs rename to src/benchmarks/micro/runtime/perflab/StackWalk.cs From e38c510ef1dcbd9eb55da2c0c479f77631d0a983 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:40:49 +0100 Subject: [PATCH 03/16] change categories names --- src/benchmarks/micro/Categories.cs | 4 ++-- src/benchmarks/micro/MicroBenchmarks.csproj | 4 ++-- src/benchmarks/micro/Program.cs | 2 +- src/benchmarks/micro/Serializers/Binary_FromStream.cs | 2 +- src/benchmarks/micro/Serializers/Binary_ToStream.cs | 2 +- src/benchmarks/micro/Serializers/Json_FromStream.cs | 4 ++-- src/benchmarks/micro/Serializers/Json_FromString.cs | 2 +- src/benchmarks/micro/Serializers/Json_ToStream.cs | 4 ++-- src/benchmarks/micro/Serializers/Json_ToString.cs | 2 +- src/benchmarks/micro/Serializers/Xml_FromStream.cs | 4 ++-- src/benchmarks/micro/Serializers/Xml_ToStream.cs | 4 ++-- .../micro/libraries/System.Buffers/ArrayPoolTests.cs | 4 ++-- .../micro/libraries/System.Buffers/Base64Tests.cs | 4 ++-- .../System.Buffers/BinaryReadAndWriteTests.cs | 2 +- .../libraries/System.Buffers/ReadOnlySequenceTests.cs | 2 +- .../libraries/System.Buffers/Utf8FormatterTests.cs | 2 +- .../micro/libraries/System.Buffers/Utf8ParserTests.cs | 2 +- .../libraries/System.Collections/Add/AddGivenSize.cs | 6 +++--- .../System.Collections/Add/TryAddDefaultSize.cs | 2 +- .../System.Collections/Add/TryAddGivenSize.cs | 2 +- .../AddRemove/AddRemoveSteadyState.cs | 2 +- .../Concurrent/AddRemoveFromDifferentThreads.cs | 2 +- .../Concurrent/AddRemoveFromSameThreads.cs | 2 +- .../libraries/System.Collections/Concurrent/Count.cs | 2 +- .../libraries/System.Collections/Concurrent/IsEmpty.cs | 2 +- .../System.Collections/Contains/ContainsFalse.cs | 4 ++-- .../System.Collections/Contains/ContainsKeyFalse.cs | 4 ++-- .../System.Collections/Contains/ContainsKeyTrue.cs | 4 ++-- .../System.Collections/Contains/ContainsTrue.cs | 4 ++-- .../micro/libraries/System.Collections/CopyTo.cs | 2 +- .../System.Collections/Create/CtorDefaultSize.cs | 2 +- .../Create/CtorDefaultSizeNonGeneric.cs | 2 +- .../System.Collections/Create/CtorFromCollection.cs | 2 +- .../Create/CtorFromCollectionNonGeneric.cs | 2 +- .../System.Collections/Create/CtorGivenSize.cs | 2 +- .../Create/CtorGivenSizeNonGeneric.cs | 2 +- .../libraries/System.Collections/CreateAddAndClear.cs | 10 +++++----- .../libraries/System.Collections/CreateAddAndRemove.cs | 2 +- .../Dictionary/DictionarySequentialKeys.cs | 2 +- .../System.Collections/Dictionary/Perf_Dictionary.cs | 2 +- .../libraries/System.Collections/Indexer/IndexerSet.cs | 4 ++-- .../System.Collections/Indexer/IndexerSetReverse.cs | 4 ++-- .../libraries/System.Collections/Iterate/IterateFor.cs | 4 ++-- .../System.Collections/Iterate/IterateForEach.cs | 4 ++-- .../Iterate/IterateForEachNonGeneric.cs | 2 +- .../System.Collections/Iterate/IterateForNonGeneric.cs | 2 +- .../libraries/System.Collections/Perf.BitArray.cs | 2 +- .../micro/libraries/System.Collections/Sort.cs | 2 +- .../System.Collections/SortedSet/Perf_SortedSet.cs | 2 +- .../System.Collections/TryGetValue/TryGetValueFalse.cs | 4 ++-- .../System.Collections/TryGetValue/TryGetValueTrue.cs | 4 ++-- .../Perf.TypeDescriptorTests.cs | 2 +- .../micro/libraries/System.Console/Perf.Console.cs | 2 +- .../micro/libraries/System.Diagnostics/Perf_Process.cs | 2 +- .../micro/libraries/System.Drawing/Perf_Color.cs | 2 +- .../System.Drawing/Perf_Graphics_DrawBeziers.cs | 2 +- .../System.Drawing/Perf_Graphics_Transforms.cs | 2 +- .../micro/libraries/System.Drawing/Perf_Image_Load.cs | 2 +- .../libraries/System.Globalization/Perf.CultureInfo.cs | 2 +- .../System.Globalization/Perf.DateTimeCultureInfo.cs | 2 +- .../System.Globalization/Perf.NumberCultureInfo.cs | 2 +- .../libraries/System.Globalization/StringEquality.cs | 2 +- .../micro/libraries/System.Globalization/StringHash.cs | 2 +- .../libraries/System.Globalization/StringSearch.cs | 2 +- .../micro/libraries/System.IO.Compression/Brotli.cs | 2 +- .../CompressionStreamPerfTestBase.cs | 2 +- .../libraries/System.IO.FileSystem/Perf.Directory.cs | 2 +- .../micro/libraries/System.IO.FileSystem/Perf.File.cs | 2 +- .../libraries/System.IO.FileSystem/Perf.FileInfo.cs | 2 +- .../libraries/System.IO.FileSystem/Perf.FileStream.cs | 2 +- .../Perf.MemoryMappedFile.cs | 2 +- .../micro/libraries/System.IO.Pipelines/Perf.Pipe.cs | 2 +- .../System.IO.Pipelines/PipeThroughputBenchmark.cs | 2 +- .../micro/libraries/System.IO.Pipes/Perf.PipeTest.cs | 2 +- .../micro/libraries/System.Linq/Perf.Enumerable.cs | 2 +- .../micro/libraries/System.Linq/Perf.OrderBy.cs | 2 +- .../micro/libraries/System.Memory/Constructors.cs | 4 ++-- src/benchmarks/micro/libraries/System.Memory/Memory.cs | 2 +- .../micro/libraries/System.Memory/MemoryMarshal.cs | 2 +- .../micro/libraries/System.Memory/ReadOnlyMemory.cs | 2 +- .../micro/libraries/System.Memory/ReadOnlySequence.cs | 2 +- .../micro/libraries/System.Memory/ReadOnlySpan.cs | 2 +- .../micro/libraries/System.Memory/SequenceReader.cs | 2 +- src/benchmarks/micro/libraries/System.Memory/Slice.cs | 2 +- src/benchmarks/micro/libraries/System.Memory/Span.cs | 2 +- .../System.Net.Http/Perf.SocketsHttpHandler.cs | 2 +- .../NetworkInterfaceTests.cs | 2 +- .../PhysicalAddressTests.cs | 2 +- .../System.Net.Primitives/CredentialCacheTests.cs | 2 +- .../micro/libraries/System.Net.Primitives/DnsTests.cs | 2 +- .../System.Net.Primitives/IPAddressPerformanceTests.cs | 2 +- .../libraries/System.Net.Security/SslStreamTests.cs | 2 +- .../System.Net.Sockets/Perf.Socket.SendReceive.cs | 2 +- .../GenericVectorConstructorTests.cs | 2 +- .../libraries/System.Numerics.Vectors/Perf_Vector2.cs | 2 +- .../libraries/System.Numerics.Vectors/Perf_Vector3.cs | 2 +- .../libraries/System.Numerics.Vectors/Perf_Vector4.cs | 2 +- .../System.Runtime.Extensions/Perf.Convert.cs | 2 +- .../System.Runtime.Extensions/Perf.Environment.cs | 2 +- .../libraries/System.Runtime.Extensions/Perf.Path.cs | 2 +- .../libraries/System.Runtime.Extensions/Perf.Random.cs | 2 +- .../System.Runtime.Extensions/Perf.StreamWriter.cs | 2 +- .../System.Runtime.Extensions/Perf.WebUtility.cs | 2 +- .../System.Runtime.InteropServices/SafeHandleTests.cs | 2 +- .../System.Runtime.Numerics/Perf.BigInteger.cs | 2 +- .../Perf.BinaryFormatter.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Array.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Boolean.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Byte.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Char.cs | 2 +- .../micro/libraries/System.Runtime/Perf.DateTime.cs | 2 +- .../libraries/System.Runtime/Perf.DateTimeOffset.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Decimal.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Double.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Enum.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Guid.cs | 2 +- .../micro/libraries/System.Runtime/Perf.HashCode.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Int16.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Int32.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Int64.cs | 2 +- .../micro/libraries/System.Runtime/Perf.IntPtr.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Lazy.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Object.cs | 2 +- .../micro/libraries/System.Runtime/Perf.SByte.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Single.cs | 2 +- .../micro/libraries/System.Runtime/Perf.String.cs | 2 +- .../micro/libraries/System.Runtime/Perf.TimeSpan.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Type.cs | 2 +- .../micro/libraries/System.Runtime/Perf.UInt16.cs | 2 +- .../micro/libraries/System.Runtime/Perf.UInt32.cs | 2 +- .../micro/libraries/System.Runtime/Perf.UInt64.cs | 2 +- .../micro/libraries/System.Runtime/Perf.Uri.cs | 2 +- .../Perf.FixedTimeEquals.cs | 2 +- .../X509Certificate2Tests.cs | 2 +- .../System.Security.Cryptography/Perf.CryptoConfig.cs | 2 +- .../System.Security.Cryptography/Perf.Hashing.cs | 2 +- .../Perf.Rfc2898DeriveBytes.cs | 2 +- .../libraries/System.Text.Encoding/Perf.Encoding.cs | 2 +- .../libraries/System.Text.Json/Serializer/ReadJson.cs | 6 +++--- .../libraries/System.Text.Json/Serializer/WriteJson.cs | 8 ++++---- .../System.Text.Json/Utf8JsonReader/Perf.Base64.cs | 2 +- .../System.Text.Json/Utf8JsonReader/Perf.Depth.cs | 2 +- .../System.Text.Json/Utf8JsonReader/Perf.Reader.cs | 2 +- .../System.Text.Json/Utf8JsonReader/Perf.Segment.cs | 2 +- .../Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Base64.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Basic.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Deep.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Guids.cs | 2 +- .../System.Text.Json/Utf8JsonWriter/Perf.Strings.cs | 2 +- .../System.Text.RegularExpressions/Perf.Regex.Cache.cs | 2 +- .../Perf.Regex.Common.cs | 2 +- .../micro/libraries/System.Text/Perf.StringBuilder.cs | 2 +- .../System.Threading.Channels/Perf.Channel.cs | 2 +- .../Perf.ValueTask.cs | 2 +- .../System.Threading.Tasks/Perf.AsyncMethods.cs | 2 +- .../System.Threading.ThreadPool/Perf.ThreadPool.cs | 2 +- .../libraries/System.Threading.Timers/Perf.Timer.cs | 2 +- .../System.Threading/Perf.CancellationToken.cs | 2 +- .../libraries/System.Threading/Perf.EventWaitHandle.cs | 2 +- .../libraries/System.Threading/Perf.Interlocked.cs | 2 +- .../micro/libraries/System.Threading/Perf.Lock.cs | 2 +- .../micro/libraries/System.Threading/Perf.Monitor.cs | 2 +- .../micro/libraries/System.Threading/Perf.SpinLock.cs | 2 +- .../micro/libraries/System.Threading/Perf.Thread.cs | 2 +- .../libraries/System.Threading/Perf.ThreadStatic.cs | 2 +- .../micro/libraries/System.Threading/Perf.Volatile.cs | 2 +- .../micro/libraries/System.Xml.Linq/Perf.XDocument.cs | 2 +- .../micro/libraries/System.Xml.Linq/Perf.XElement.cs | 2 +- .../libraries/System.Xml.Linq/Perf.XElementList.cs | 2 +- .../micro/libraries/System.Xml.Linq/Perf.XName.cs | 2 +- .../System.Xml.XmlDocument/Perf.XmlDocument.cs | 2 +- .../libraries/System.Xml.XmlDocument/Perf.XmlNode.cs | 2 +- .../System.Xml.XmlDocument/Perf.XmlNodeList.cs | 2 +- src/benchmarks/micro/libraries/System/Hashing.cs | 2 +- .../micro/runtime/BenchmarksGame/binarytrees-2.cs | 2 +- .../micro/runtime/BenchmarksGame/binarytrees-5.cs | 2 +- .../micro/runtime/BenchmarksGame/fannkuch-redux-2.cs | 2 +- .../micro/runtime/BenchmarksGame/fannkuch-redux-5.cs | 2 +- src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs | 2 +- src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs | 2 +- .../micro/runtime/BenchmarksGame/k-nucleotide-1.cs | 2 +- .../micro/runtime/BenchmarksGame/k-nucleotide-9.cs | 2 +- .../micro/runtime/BenchmarksGame/mandelbrot-2.cs | 2 +- .../micro/runtime/BenchmarksGame/mandelbrot-7.cs | 2 +- .../micro/runtime/BenchmarksGame/n-body-3.cs | 2 +- .../micro/runtime/BenchmarksGame/pidigits-3.cs | 2 +- .../micro/runtime/BenchmarksGame/regex-redux-1.cs | 2 +- .../micro/runtime/BenchmarksGame/regex-redux-5.cs | 2 +- .../runtime/BenchmarksGame/reverse-complement-1.cs | 2 +- .../runtime/BenchmarksGame/reverse-complement-6.cs | 2 +- .../micro/runtime/BenchmarksGame/spectralnorm-1.cs | 2 +- .../micro/runtime/BenchmarksGame/spectralnorm-3.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Adams.cs | 2 +- .../micro/runtime/Benchstones/BenchF/BenchMk2.cs | 2 +- .../micro/runtime/Benchstones/BenchF/BenchMrk.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Bisect.cs | 2 +- .../micro/runtime/Benchstones/BenchF/DMath.cs | 2 +- src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs | 2 +- .../micro/runtime/Benchstones/BenchF/InProd.cs | 2 +- .../micro/runtime/Benchstones/BenchF/InvMt.cs | 2 +- .../micro/runtime/Benchstones/BenchF/LLoops.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Lorenz.cs | 2 +- .../micro/runtime/Benchstones/BenchF/MatInv4.cs | 2 +- .../micro/runtime/Benchstones/BenchF/NewtE.cs | 2 +- .../micro/runtime/Benchstones/BenchF/NewtR.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Regula.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Romber.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Secant.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Simpsn.cs | 2 +- .../micro/runtime/Benchstones/BenchF/SqMtx.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Trap.cs | 2 +- .../micro/runtime/Benchstones/BenchF/Whetsto.cs | 2 +- .../micro/runtime/Benchstones/BenchI/8Queens.cs | 2 +- .../micro/runtime/Benchstones/BenchI/Ackermann.cs | 2 +- .../micro/runtime/Benchstones/BenchI/AddArray.cs | 2 +- .../micro/runtime/Benchstones/BenchI/AddArray2.cs | 2 +- .../micro/runtime/Benchstones/BenchI/Array1.cs | 2 +- .../micro/runtime/Benchstones/BenchI/Array2.cs | 2 +- .../micro/runtime/Benchstones/BenchI/BenchE.cs | 2 +- .../micro/runtime/Benchstones/BenchI/BubbleSort.cs | 2 +- .../micro/runtime/Benchstones/BenchI/BubbleSort2.cs | 2 +- .../micro/runtime/Benchstones/BenchI/CSieve.cs | 2 +- src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs | 2 +- .../micro/runtime/Benchstones/BenchI/HeapSort.cs | 2 +- .../micro/runtime/Benchstones/BenchI/IniArray.cs | 2 +- .../micro/runtime/Benchstones/BenchI/LogicArray.cs | 2 +- .../micro/runtime/Benchstones/BenchI/Midpoint.cs | 2 +- .../micro/runtime/Benchstones/BenchI/MulMatrix.cs | 2 +- .../micro/runtime/Benchstones/BenchI/NDhrystone.cs | 2 +- .../micro/runtime/Benchstones/BenchI/Permutate.cs | 2 +- src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs | 2 +- .../micro/runtime/Benchstones/BenchI/Puzzle.cs | 2 +- .../micro/runtime/Benchstones/BenchI/QuickSort.cs | 2 +- .../micro/runtime/Benchstones/BenchI/TreeInsert.cs | 2 +- .../micro/runtime/Benchstones/BenchI/TreeSort.cs | 2 +- .../micro/runtime/Benchstones/BenchI/XposMatrix.cs | 2 +- .../micro/runtime/BilinearInterpol/BilinearInterpol.cs | 6 +++--- src/benchmarks/micro/runtime/Burgers/Burgers.cs | 2 +- src/benchmarks/micro/runtime/Bytemark/ByteMark.cs | 2 +- .../micro/runtime/Devirtualization/Boxing.cs | 2 +- .../Devirtualization/DefaultEqualityComparerPerf.cs | 2 +- .../Devirtualization/GuardedThreeClassInterface.cs | 2 +- .../Devirtualization/GuardedThreeClassVirtual.cs | 2 +- .../Devirtualization/GuardedTwoClassInterface.cs | 2 +- .../runtime/Devirtualization/GuardedTwoClassVirtual.cs | 2 +- src/benchmarks/micro/runtime/Exceptions/Handling.cs | 2 +- .../micro/runtime/FractalPerf/FractalPerf.cs | 2 +- .../micro/runtime/Inlining/InlineGCStruct.cs | 2 +- src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs | 2 +- src/benchmarks/micro/runtime/Layout/SearchLoops.cs | 2 +- src/benchmarks/micro/runtime/Linq/Linq.cs | 2 +- .../micro/runtime/Lowering/InstructionReplacement.cs | 2 +- .../micro/runtime/Math/Functions/Double/AbsDouble.cs | 2 +- .../micro/runtime/Math/Functions/MathTests.cs | 2 +- .../micro/runtime/Math/Functions/Single/AbsSingle.cs | 2 +- src/benchmarks/micro/runtime/PacketTracer/Render.cs | 2 +- src/benchmarks/micro/runtime/Roslyn/CscBench.cs | 2 +- .../micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs | 2 +- .../micro/runtime/SIMD/RayTracer/RayTracerBench.cs | 2 +- .../micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs | 2 +- src/benchmarks/micro/runtime/SciMark/kernel.cs | 2 +- src/benchmarks/micro/runtime/Span/Indexer.cs | 2 +- src/benchmarks/micro/runtime/Span/Sorting.cs | 2 +- .../micro/runtime/System.Reflection/Activator.cs | 2 +- .../micro/runtime/System.Reflection/Attributes.cs | 2 +- src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs | 2 +- src/benchmarks/micro/runtime/V8/Richards/Richards.cs | 2 +- src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs | 2 +- src/benchmarks/micro/runtime/perflab/CastingPerf.cs | 2 +- src/benchmarks/micro/runtime/perflab/CastingPerf2.cs | 2 +- src/benchmarks/micro/runtime/perflab/DelegatePerf.cs | 2 +- .../micro/runtime/perflab/DictionaryExpansion.cs | 2 +- src/benchmarks/micro/runtime/perflab/EnumPerf.cs | 2 +- src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs | 2 +- src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs | 2 +- src/benchmarks/micro/runtime/perflab/StackWalk.cs | 2 +- 281 files changed, 313 insertions(+), 313 deletions(-) diff --git a/src/benchmarks/micro/Categories.cs b/src/benchmarks/micro/Categories.cs index b3a0398376d..6a64413e527 100644 --- a/src/benchmarks/micro/Categories.cs +++ b/src/benchmarks/micro/Categories.cs @@ -15,12 +15,12 @@ public static class Categories /// /// benchmarks belonging to this category are executed for CoreFX CI jobs /// - public const string CoreFX = "CoreFX"; + public const string Libraries = "CoreFX"; /// /// benchmarks belonging to this category are executed for CoreCLR CI jobs /// - public const string CoreCLR = "CoreCLR"; + public const string Runtime = "CoreCLR"; public const string BenchmarksGame = "BenchmarksGame"; public const string Benchstones = "Benchstones"; public const string BenchF = "BenchF"; diff --git a/src/benchmarks/micro/MicroBenchmarks.csproj b/src/benchmarks/micro/MicroBenchmarks.csproj index 79c8f504c61..7d35294c6c5 100644 --- a/src/benchmarks/micro/MicroBenchmarks.csproj +++ b/src/benchmarks/micro/MicroBenchmarks.csproj @@ -4,8 +4,8 @@ $(PERFLAB_TARGET_FRAMEWORKS) - net461;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp5.0 - netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp5.0 + net461;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0 + netcoreapp2.1;netcoreapp2.2;netcoreapp3.0 Exe AnyCPU diff --git a/src/benchmarks/micro/Program.cs b/src/benchmarks/micro/Program.cs index 2b3d1580688..9ecce6580ad 100644 --- a/src/benchmarks/micro/Program.cs +++ b/src/benchmarks/micro/Program.cs @@ -36,7 +36,7 @@ static int Main(string[] args) .FromAssembly(typeof(Program).Assembly) .Run(argsList.ToArray(), RecommendedConfig.Create( artifactsPath: new DirectoryInfo(Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location), "BenchmarkDotNet.Artifacts")), - mandatoryCategories: ImmutableHashSet.Create(Categories.CoreFX, Categories.CoreCLR, Categories.ThirdParty), + mandatoryCategories: ImmutableHashSet.Create(Categories.Libraries, Categories.Runtime, Categories.ThirdParty), partitionCount: partitionCount, partitionIndex: partitionIndex)) .ToExitCode(); diff --git a/src/benchmarks/micro/Serializers/Binary_FromStream.cs b/src/benchmarks/micro/Serializers/Binary_FromStream.cs index 4d4978fce2d..4cb986307cf 100644 --- a/src/benchmarks/micro/Serializers/Binary_FromStream.cs +++ b/src/benchmarks/micro/Serializers/Binary_FromStream.cs @@ -53,7 +53,7 @@ public void SetupMessagePack() MessagePack.MessagePackSerializer.Serialize(memoryStream, value); } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [Benchmark(Description = nameof(BinaryFormatter))] public T BinaryFormatter_() { diff --git a/src/benchmarks/micro/Serializers/Binary_ToStream.cs b/src/benchmarks/micro/Serializers/Binary_ToStream.cs index cc796ed7e19..669e467e2c2 100644 --- a/src/benchmarks/micro/Serializers/Binary_ToStream.cs +++ b/src/benchmarks/micro/Serializers/Binary_ToStream.cs @@ -32,7 +32,7 @@ public Binary_ToStream() ProtoBuf.Meta.RuntimeTypeModel.Default.Add(typeof(DateTimeOffset), false).SetSurrogate(typeof(DateTimeOffsetSurrogate)); // https://stackoverflow.com/a/7046868 } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [Benchmark(Description = nameof(BinaryFormatter))] public void BinaryFormatter_() { diff --git a/src/benchmarks/micro/Serializers/Json_FromStream.cs b/src/benchmarks/micro/Serializers/Json_FromStream.cs index f6d18e5aba8..ce2a88f73a9 100644 --- a/src/benchmarks/micro/Serializers/Json_FromStream.cs +++ b/src/benchmarks/micro/Serializers/Json_FromStream.cs @@ -84,7 +84,7 @@ public T Jil_() return Jil.JSON.Deserialize(reader, Jil.Options.ISO8601); } - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.ThirdParty)] // JSON.NET is so popular that despite being 3rd Party lib we run the benchmarks for CoreFX and CoreCLR CI + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.ThirdParty)] // JSON.NET is so popular that despite being 3rd Party lib we run the benchmarks for CoreFX and CoreCLR CI [Benchmark(Description = "JSON.NET")] public T JsonNet_() { @@ -102,7 +102,7 @@ public T Utf8Json_() return Utf8Json.JsonSerializer.Deserialize(memoryStream); } - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries)] [Benchmark(Description = "DataContractJsonSerializer")] public T DataContractJsonSerializer_() { diff --git a/src/benchmarks/micro/Serializers/Json_FromString.cs b/src/benchmarks/micro/Serializers/Json_FromString.cs index 1e4b0bc9f74..503439511e8 100644 --- a/src/benchmarks/micro/Serializers/Json_FromString.cs +++ b/src/benchmarks/micro/Serializers/Json_FromString.cs @@ -36,7 +36,7 @@ public void SerializeJil() [Benchmark(Description = "Jil")] public T Jil_() => Jil.JSON.Deserialize(serialized, Jil.Options.ISO8601); - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.ThirdParty)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.ThirdParty)] [Benchmark(Description = "JSON.NET")] public T JsonNet_() => Newtonsoft.Json.JsonConvert.DeserializeObject(serialized); diff --git a/src/benchmarks/micro/Serializers/Json_ToStream.cs b/src/benchmarks/micro/Serializers/Json_ToStream.cs index eaa6b32bd76..9617e2560df 100644 --- a/src/benchmarks/micro/Serializers/Json_ToStream.cs +++ b/src/benchmarks/micro/Serializers/Json_ToStream.cs @@ -47,7 +47,7 @@ public void Jil_() Jil.JSON.Serialize(value, streamWriter, Jil.Options.ISO8601); } - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.ThirdParty)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.ThirdParty)] [Benchmark(Description = "JSON.NET")] public void JsonNet_() { @@ -63,7 +63,7 @@ public void Utf8Json_() Utf8Json.JsonSerializer.Serialize(memoryStream, value); } - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries)] [Benchmark(Description = "DataContractJsonSerializer")] public void DataContractJsonSerializer_() { diff --git a/src/benchmarks/micro/Serializers/Json_ToString.cs b/src/benchmarks/micro/Serializers/Json_ToString.cs index 69ad01c52c0..bba07c8a1fd 100644 --- a/src/benchmarks/micro/Serializers/Json_ToString.cs +++ b/src/benchmarks/micro/Serializers/Json_ToString.cs @@ -24,7 +24,7 @@ public class Json_ToString [Benchmark(Description = "Jil")] public string Jil_() => Jil.JSON.Serialize(value, Jil.Options.ISO8601); - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.ThirdParty)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.ThirdParty)] [Benchmark(Description = "JSON.NET")] public string JsonNet_() => Newtonsoft.Json.JsonConvert.SerializeObject(value); diff --git a/src/benchmarks/micro/Serializers/Xml_FromStream.cs b/src/benchmarks/micro/Serializers/Xml_FromStream.cs index 785b3e196eb..6d7b98ab74e 100644 --- a/src/benchmarks/micro/Serializers/Xml_FromStream.cs +++ b/src/benchmarks/micro/Serializers/Xml_FromStream.cs @@ -47,7 +47,7 @@ public void SetupDataContractSerializer() dataContractSerializer.WriteObject(memoryStream, value); } - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] [Benchmark(Description = nameof(XmlSerializer))] public T XmlSerializer_() { @@ -55,7 +55,7 @@ public T XmlSerializer_() return (T)xmlSerializer.Deserialize(memoryStream); } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [Benchmark(Description = nameof(DataContractSerializer))] public T DataContractSerializer_() { diff --git a/src/benchmarks/micro/Serializers/Xml_ToStream.cs b/src/benchmarks/micro/Serializers/Xml_ToStream.cs index b9cde91ecaa..6e3b94adad2 100644 --- a/src/benchmarks/micro/Serializers/Xml_ToStream.cs +++ b/src/benchmarks/micro/Serializers/Xml_ToStream.cs @@ -33,7 +33,7 @@ public Xml_ToStream() memoryStream = new MemoryStream(capacity: short.MaxValue); } - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] [Benchmark(Description = nameof(XmlSerializer))] public void XmlSerializer_() { @@ -41,7 +41,7 @@ public void XmlSerializer_() xmlSerializer.Serialize(memoryStream, value); } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [Benchmark(Description = nameof(DataContractSerializer))] public void DataContractSerializer_() { diff --git a/src/benchmarks/micro/libraries/System.Buffers/ArrayPoolTests.cs b/src/benchmarks/micro/libraries/System.Buffers/ArrayPoolTests.cs index 622868afb61..4047ecafcc4 100644 --- a/src/benchmarks/micro/libraries/System.Buffers/ArrayPoolTests.cs +++ b/src/benchmarks/micro/libraries/System.Buffers/ArrayPoolTests.cs @@ -10,7 +10,7 @@ namespace System.Buffers.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [GenericTypeArguments(typeof(byte))] // value type [GenericTypeArguments(typeof(object))] // reference type public class RentReturnArrayPoolTests @@ -148,7 +148,7 @@ public async Task ProducerConsumer() } } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [GenericTypeArguments(typeof(byte))] // value type [GenericTypeArguments(typeof(object))] // reference type public class NonStandardArrayPoolTests diff --git a/src/benchmarks/micro/libraries/System.Buffers/Base64Tests.cs b/src/benchmarks/micro/libraries/System.Buffers/Base64Tests.cs index 0d4fc0a5f5f..126d6cf40b3 100644 --- a/src/benchmarks/micro/libraries/System.Buffers/Base64Tests.cs +++ b/src/benchmarks/micro/libraries/System.Buffers/Base64Tests.cs @@ -8,7 +8,7 @@ namespace System.Buffers.Text.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Base64Tests { [Params(1000)] @@ -86,7 +86,7 @@ public void SetupConvertTryFromBase64Chars() // To setup every benchmark invocation we are using [IterationSetup]. // To make the results stable the Iteration needs to last at least 100ms, this is why we are using bigger value for NumberOfBytes // Due to limitation of BDN, where Params have no Target and are applied to entire class the benchmarks live in a separate class. - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [WarmupCount(30)] // make sure it's promoted to Tier 1 public class Base64EncodeDecodeInPlaceTests { diff --git a/src/benchmarks/micro/libraries/System.Buffers/BinaryReadAndWriteTests.cs b/src/benchmarks/micro/libraries/System.Buffers/BinaryReadAndWriteTests.cs index 89c701acbb4..fbdfff8786e 100644 --- a/src/benchmarks/micro/libraries/System.Buffers/BinaryReadAndWriteTests.cs +++ b/src/benchmarks/micro/libraries/System.Buffers/BinaryReadAndWriteTests.cs @@ -12,7 +12,7 @@ namespace System.Buffers.Binary.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] public class BinaryReadAndWriteTests { private readonly static byte[] _arrayLE = GetSpanLE().ToArray(); diff --git a/src/benchmarks/micro/libraries/System.Buffers/ReadOnlySequenceTests.cs b/src/benchmarks/micro/libraries/System.Buffers/ReadOnlySequenceTests.cs index 7736899dd8f..a092f0bfca6 100644 --- a/src/benchmarks/micro/libraries/System.Buffers/ReadOnlySequenceTests.cs +++ b/src/benchmarks/micro/libraries/System.Buffers/ReadOnlySequenceTests.cs @@ -6,7 +6,7 @@ namespace System.Buffers.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(char))] public class ReadOnlySequenceTests diff --git a/src/benchmarks/micro/libraries/System.Buffers/Utf8FormatterTests.cs b/src/benchmarks/micro/libraries/System.Buffers/Utf8FormatterTests.cs index aa3a2b1bf46..94af81fca64 100644 --- a/src/benchmarks/micro/libraries/System.Buffers/Utf8FormatterTests.cs +++ b/src/benchmarks/micro/libraries/System.Buffers/Utf8FormatterTests.cs @@ -9,7 +9,7 @@ namespace System.Buffers.Text.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Utf8FormatterTests { private readonly byte[] _destination = new byte[1000]; // big enough to store anything we want to format diff --git a/src/benchmarks/micro/libraries/System.Buffers/Utf8ParserTests.cs b/src/benchmarks/micro/libraries/System.Buffers/Utf8ParserTests.cs index b46951e0751..78922f00cc7 100644 --- a/src/benchmarks/micro/libraries/System.Buffers/Utf8ParserTests.cs +++ b/src/benchmarks/micro/libraries/System.Buffers/Utf8ParserTests.cs @@ -11,7 +11,7 @@ namespace System.Buffers.Text.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Utf8ParserTests { public IEnumerable Int64Values diff --git a/src/benchmarks/micro/libraries/System.Collections/Add/AddGivenSize.cs b/src/benchmarks/micro/libraries/System.Collections/Add/AddGivenSize.cs index 31f3cddc7d1..e37593dee35 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Add/AddGivenSize.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Add/AddGivenSize.cs @@ -11,7 +11,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class AddGivenSize @@ -35,7 +35,7 @@ public List List() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public ICollection ICollection() => AddToICollection(new List(Size)); [MethodImpl(MethodImplOptions.NoInlining)] @@ -70,7 +70,7 @@ public Dictionary Dictionary() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public IDictionary IDictionary() => AddToIDictionary(new Dictionary(Size)); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Add/TryAddDefaultSize.cs b/src/benchmarks/micro/libraries/System.Collections/Add/TryAddDefaultSize.cs index 0e4b9fac761..7939abd052c 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Add/TryAddDefaultSize.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Add/TryAddDefaultSize.cs @@ -10,7 +10,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class TryAddDefaultSize diff --git a/src/benchmarks/micro/libraries/System.Collections/Add/TryAddGivenSize.cs b/src/benchmarks/micro/libraries/System.Collections/Add/TryAddGivenSize.cs index bcb78513072..c0d06db6e21 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Add/TryAddGivenSize.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Add/TryAddGivenSize.cs @@ -10,7 +10,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class TryAddGiventSize diff --git a/src/benchmarks/micro/libraries/System.Collections/AddRemove/AddRemoveSteadyState.cs b/src/benchmarks/micro/libraries/System.Collections/AddRemove/AddRemoveSteadyState.cs index fe4feb83cfd..5f345fa4f2f 100644 --- a/src/benchmarks/micro/libraries/System.Collections/AddRemove/AddRemoveSteadyState.cs +++ b/src/benchmarks/micro/libraries/System.Collections/AddRemove/AddRemoveSteadyState.cs @@ -10,7 +10,7 @@ namespace System.Collections.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class Add_Remove_SteadyState // serialized producer/consumer throughput when the collection has reached a steady-state size diff --git a/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs index c7aaae38418..d0dbf5d7607 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs @@ -10,7 +10,7 @@ namespace System.Collections.Concurrent { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type [MinWarmupCount(6, forceAutoWarmup: true)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromSameThreads.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromSameThreads.cs index f091306f861..18e0e146620 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromSameThreads.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromSameThreads.cs @@ -10,7 +10,7 @@ namespace System.Collections.Concurrent { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type [MinWarmupCount(6, forceAutoWarmup: true)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Concurrent/Count.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/Count.cs index b29a1752dad..95e9bd70c27 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Concurrent/Count.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Concurrent/Count.cs @@ -9,7 +9,7 @@ namespace System.Collections.Concurrent { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class Count diff --git a/src/benchmarks/micro/libraries/System.Collections/Concurrent/IsEmpty.cs b/src/benchmarks/micro/libraries/System.Collections/Concurrent/IsEmpty.cs index 11c6c0347fa..cfc788f4640 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Concurrent/IsEmpty.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Concurrent/IsEmpty.cs @@ -9,7 +9,7 @@ namespace System.Collections.Concurrent { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class IsEmpty diff --git a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsFalse.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsFalse.cs index ef091b004cd..dddf82dfe90 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsFalse.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsFalse.cs @@ -12,7 +12,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class ContainsFalse @@ -92,7 +92,7 @@ public bool List() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public bool ICollection() => Contains(_list); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyFalse.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyFalse.cs index acd43eb9ac1..8fd5eaaad2a 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyFalse.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyFalse.cs @@ -13,7 +13,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int), typeof(int))] // value type [GenericTypeArguments(typeof(string), typeof(string))] // reference type public class ContainsKeyFalse @@ -58,7 +58,7 @@ public bool Dictionary() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public bool IDictionary() => ContainsKey(_dictionary); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyTrue.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyTrue.cs index d4c70fb2379..1d7a3b23352 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyTrue.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsKeyTrue.cs @@ -13,7 +13,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int), typeof(int))] // value type [GenericTypeArguments(typeof(string), typeof(string))] // reference type public class ContainsKeyTrue @@ -56,7 +56,7 @@ public bool Dictionary() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public bool IDictionary() => ContainsKey(_dictionary); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsTrue.cs b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsTrue.cs index dd33fcd19cc..b7768b163f0 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsTrue.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Contains/ContainsTrue.cs @@ -12,7 +12,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class ContainsTrue @@ -89,7 +89,7 @@ public bool List() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public bool ICollection() => Contains(_list); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/CopyTo.cs b/src/benchmarks/micro/libraries/System.Collections/CopyTo.cs index eef1d6c90ab..82d9f75b852 100644 --- a/src/benchmarks/micro/libraries/System.Collections/CopyTo.cs +++ b/src/benchmarks/micro/libraries/System.Collections/CopyTo.cs @@ -10,7 +10,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreCLR, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Runtime, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class CopyTo diff --git a/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSize.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSize.cs index a268571efa9..ecd8a73973e 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSize.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSize.cs @@ -10,7 +10,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class CtorDefaultSize diff --git a/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSizeNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSizeNonGeneric.cs index 49c55da1dc3..f637e4f8d57 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSizeNonGeneric.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Create/CtorDefaultSizeNonGeneric.cs @@ -7,7 +7,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.NonGenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.NonGenericCollections)] public class CtorDefaultSizeNonGeneric { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollection.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollection.cs index ae42268cc7b..d0910e3add4 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollection.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollection.cs @@ -11,7 +11,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class CtorFromCollection diff --git a/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollectionNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollectionNonGeneric.cs index 3cb27db7096..0458e7cd472 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollectionNonGeneric.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Create/CtorFromCollectionNonGeneric.cs @@ -8,7 +8,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.NonGenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.NonGenericCollections)] [GenericTypeArguments(typeof(int))] // value type (it shows how bad idea is to use non-generic collections for value types) [GenericTypeArguments(typeof(string))] // reference type public class CtorFromCollectionNonGeneric diff --git a/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSize.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSize.cs index f1cc6ff88c0..64b138ed7de 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSize.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSize.cs @@ -9,7 +9,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class CtorGivenSize diff --git a/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSizeNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSizeNonGeneric.cs index f9dca17bbed..1855ced6215 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSizeNonGeneric.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Create/CtorGivenSizeNonGeneric.cs @@ -7,7 +7,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.NonGenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.NonGenericCollections)] public class CtorGivenSizeNonGeneric { [Params(Utils.DefaultCollectionSize)] diff --git a/src/benchmarks/micro/libraries/System.Collections/CreateAddAndClear.cs b/src/benchmarks/micro/libraries/System.Collections/CreateAddAndClear.cs index 19bfc00a78d..49fd2c43784 100644 --- a/src/benchmarks/micro/libraries/System.Collections/CreateAddAndClear.cs +++ b/src/benchmarks/micro/libraries/System.Collections/CreateAddAndClear.cs @@ -11,7 +11,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class CreateAddAndClear @@ -24,7 +24,7 @@ public class CreateAddAndClear [GlobalSetup] public void Setup() => _uniqueValues = ValuesGenerator.ArrayOfUniqueValues(Size); - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] [Benchmark] public T[] Array() { @@ -37,7 +37,7 @@ public T[] Array() return array; } - [BenchmarkCategory(Categories.CoreCLR, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Span)] [Benchmark] public Span Span() { @@ -63,7 +63,7 @@ public List List() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public ICollection ICollection() => ICollection(new List()); [MethodImpl(MethodImplOptions.NoInlining)] // we want to prevent from inlining this particular method to make sure that JIT does not find out that ICollection is always List @@ -114,7 +114,7 @@ public Dictionary Dictionary() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public IDictionary IDictionary() => IDictionary(new Dictionary()); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/CreateAddAndRemove.cs b/src/benchmarks/micro/libraries/System.Collections/CreateAddAndRemove.cs index 49e053f3120..0bbc9a59ad8 100644 --- a/src/benchmarks/micro/libraries/System.Collections/CreateAddAndRemove.cs +++ b/src/benchmarks/micro/libraries/System.Collections/CreateAddAndRemove.cs @@ -10,7 +10,7 @@ namespace System.Collections { // the concurrent collections are covered with benchmarks in Add_Remove_SteadyState.cs - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class CreateAddAndRemove diff --git a/src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs b/src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs index 54862c423ea..62ba3a08670 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Dictionary/DictionarySequentialKeys.cs @@ -9,7 +9,7 @@ namespace System.Collections.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] public class DictionarySequentialKeys { private const int Seventeen = 17; diff --git a/src/benchmarks/micro/libraries/System.Collections/Dictionary/Perf_Dictionary.cs b/src/benchmarks/micro/libraries/System.Collections/Dictionary/Perf_Dictionary.cs index ae96c6f10c3..cdcc7192cae 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Dictionary/Perf_Dictionary.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Dictionary/Perf_Dictionary.cs @@ -9,7 +9,7 @@ namespace System.Collections.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] public class Perf_Dictionary { [Params(3_000)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSet.cs b/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSet.cs index 106677f3f54..d5a904c326b 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSet.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSet.cs @@ -12,7 +12,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class IndexerSet @@ -72,7 +72,7 @@ public List List() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public IList IList() => Set(_list); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSetReverse.cs b/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSetReverse.cs index dd7c9d8665f..6b2d3a89405 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSetReverse.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Indexer/IndexerSetReverse.cs @@ -10,7 +10,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreCLR, Categories.Collections, Categories.GenericCollections)] // this benchmark does not belong to CoreFX because it's more a codegen benchmark + [BenchmarkCategory(Categories.Runtime, Categories.Collections, Categories.GenericCollections)] // this benchmark does not belong to CoreFX because it's more a codegen benchmark [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class IndexerSetReverse @@ -58,7 +58,7 @@ public List List() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public IList IList() => Set(_list); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateFor.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateFor.cs index 60a9900d29c..871189d7a9f 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateFor.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateFor.cs @@ -11,7 +11,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class IterateFor @@ -84,7 +84,7 @@ public T List() public void SetupIList() => _ilist = new List(ValuesGenerator.ArrayOfUniqueValues(Size)); [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public T IList() => Get(_ilist); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEach.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEach.cs index 08700d18f5d..3fe5f5141d2 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEach.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEach.cs @@ -12,7 +12,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type [GenericTypeArguments(typeof(string))] // reference type public class IterateForEach @@ -83,7 +83,7 @@ public T ReadOnlySpan() public void SetupIEnumerable() => _ienumerable = ValuesGenerator.ArrayOfUniqueValues(Size); [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public T IEnumerable() => Get(_ienumerable); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEachNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEachNonGeneric.cs index 225807e128e..48d3d86ed0b 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEachNonGeneric.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForEachNonGeneric.cs @@ -8,7 +8,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.NonGenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.NonGenericCollections)] [GenericTypeArguments(typeof(int))] // value type (it shows how bad idea is to use non-generic collections for value types) [GenericTypeArguments(typeof(string))] // reference type public class IterateForEachNonGeneric diff --git a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForNonGeneric.cs b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForNonGeneric.cs index 6a3fd078a1f..139ef543d04 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForNonGeneric.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Iterate/IterateForNonGeneric.cs @@ -8,7 +8,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.NonGenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.NonGenericCollections)] [GenericTypeArguments(typeof(int))] // value type (it shows how bad idea is to use non-generic collections for value types) [GenericTypeArguments(typeof(string))] // reference type public class IterateForNonGeneric diff --git a/src/benchmarks/micro/libraries/System.Collections/Perf.BitArray.cs b/src/benchmarks/micro/libraries/System.Collections/Perf.BitArray.cs index 1ec74428507..afb4e0a2f2b 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Perf.BitArray.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Perf.BitArray.cs @@ -8,7 +8,7 @@ namespace System.Collections.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections)] public class Perf_BitArray { private const int DefaultShiftCount = 17; diff --git a/src/benchmarks/micro/libraries/System.Collections/Sort.cs b/src/benchmarks/micro/libraries/System.Collections/Sort.cs index 9bdf3083ba6..7db1b5a85b8 100644 --- a/src/benchmarks/micro/libraries/System.Collections/Sort.cs +++ b/src/benchmarks/micro/libraries/System.Collections/Sort.cs @@ -10,7 +10,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreCLR, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Runtime, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int))] // value type, Array sort in native code [GenericTypeArguments(typeof(string))] // reference type, Array sort in native code [GenericTypeArguments(typeof(IntStruct))] // custom value type, sort in managed code diff --git a/src/benchmarks/micro/libraries/System.Collections/SortedSet/Perf_SortedSet.cs b/src/benchmarks/micro/libraries/System.Collections/SortedSet/Perf_SortedSet.cs index 1a9f12ab008..793ce704469 100644 --- a/src/benchmarks/micro/libraries/System.Collections/SortedSet/Perf_SortedSet.cs +++ b/src/benchmarks/micro/libraries/System.Collections/SortedSet/Perf_SortedSet.cs @@ -8,7 +8,7 @@ namespace System.Collections.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] public class Perf_SortedSet { private SortedSet _set; diff --git a/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueFalse.cs b/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueFalse.cs index 3961ece1997..da071905754 100644 --- a/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueFalse.cs +++ b/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueFalse.cs @@ -13,7 +13,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int), typeof(int))] // value type [GenericTypeArguments(typeof(string), typeof(string))] // reference type public class TryGetValueFalse @@ -58,7 +58,7 @@ public bool Dictionary() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public bool IDictionary() => TryGetValue(_dictionary); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueTrue.cs b/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueTrue.cs index 92f90e2f954..b40e38ba26f 100644 --- a/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueTrue.cs +++ b/src/benchmarks/micro/libraries/System.Collections/TryGetValue/TryGetValueTrue.cs @@ -13,7 +13,7 @@ namespace System.Collections { - [BenchmarkCategory(Categories.CoreFX, Categories.Collections, Categories.GenericCollections)] + [BenchmarkCategory(Categories.Libraries, Categories.Collections, Categories.GenericCollections)] [GenericTypeArguments(typeof(int), typeof(int))] // value type [GenericTypeArguments(typeof(string), typeof(string))] // reference type public class TryGetValueTrue @@ -56,7 +56,7 @@ public bool Dictionary() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public bool IDictionary() => TryGetValue(_dictionary); [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs b/src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs index 944fd1f3649..d4c01b3d420 100644 --- a/src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs +++ b/src/benchmarks/micro/libraries/System.ComponentModel.TypeConverter/Perf.TypeDescriptorTests.cs @@ -7,7 +7,7 @@ namespace System.ComponentModel.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_TypeDescriptorTests { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Console/Perf.Console.cs b/src/benchmarks/micro/libraries/System.Console/Perf.Console.cs index 1bedd89c184..9c4542cef0d 100644 --- a/src/benchmarks/micro/libraries/System.Console/Perf.Console.cs +++ b/src/benchmarks/micro/libraries/System.Console/Perf.Console.cs @@ -14,7 +14,7 @@ namespace System.ConsoleTests /// - OpenStandardInput, OpenStandardOutput, OpenStandardError /// - ForegroundColor, BackgroundColor, ResetColor /// - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Console { private readonly Consumer consumer = new Consumer(); diff --git a/src/benchmarks/micro/libraries/System.Diagnostics/Perf_Process.cs b/src/benchmarks/micro/libraries/System.Diagnostics/Perf_Process.cs index f7a57eabc44..eb7054d18ae 100644 --- a/src/benchmarks/micro/libraries/System.Diagnostics/Perf_Process.cs +++ b/src/benchmarks/micro/libraries/System.Diagnostics/Perf_Process.cs @@ -7,7 +7,7 @@ namespace System.Diagnostics { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Process { private readonly string _nonExistingName = Guid.NewGuid().ToString(); diff --git a/src/benchmarks/micro/libraries/System.Drawing/Perf_Color.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Color.cs index af47833e68b..21847579e84 100644 --- a/src/benchmarks/micro/libraries/System.Drawing/Perf_Color.cs +++ b/src/benchmarks/micro/libraries/System.Drawing/Perf_Color.cs @@ -8,7 +8,7 @@ namespace System.Drawing.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Color { private static readonly Color[] AllKnownColors; diff --git a/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs index f435ea42967..eab208f92c0 100644 --- a/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs +++ b/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_DrawBeziers.cs @@ -8,7 +8,7 @@ namespace System.Drawing.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Graphics_DrawBeziers { private Bitmap _image; diff --git a/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_Transforms.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_Transforms.cs index 398f1a4dec0..339de7d1931 100644 --- a/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_Transforms.cs +++ b/src/benchmarks/micro/libraries/System.Drawing/Perf_Graphics_Transforms.cs @@ -9,7 +9,7 @@ namespace System.Drawing.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Graphics_Transforms { private Bitmap _image; diff --git a/src/benchmarks/micro/libraries/System.Drawing/Perf_Image_Load.cs b/src/benchmarks/micro/libraries/System.Drawing/Perf_Image_Load.cs index 42484171f2a..8e009a23058 100644 --- a/src/benchmarks/micro/libraries/System.Drawing/Perf_Image_Load.cs +++ b/src/benchmarks/micro/libraries/System.Drawing/Perf_Image_Load.cs @@ -11,7 +11,7 @@ namespace System.Drawing.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Image_Load { // this field is lazy to avoid the exception during static ctor initialization of this type (harder to catch and handle properly) diff --git a/src/benchmarks/micro/libraries/System.Globalization/Perf.CultureInfo.cs b/src/benchmarks/micro/libraries/System.Globalization/Perf.CultureInfo.cs index 02807457aa1..d9e61acd10e 100644 --- a/src/benchmarks/micro/libraries/System.Globalization/Perf.CultureInfo.cs +++ b/src/benchmarks/micro/libraries/System.Globalization/Perf.CultureInfo.cs @@ -7,7 +7,7 @@ namespace System.Globalization.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_CultureInfo { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Globalization/Perf.DateTimeCultureInfo.cs b/src/benchmarks/micro/libraries/System.Globalization/Perf.DateTimeCultureInfo.cs index 2a6ce01d751..c0fc4cdd843 100644 --- a/src/benchmarks/micro/libraries/System.Globalization/Perf.DateTimeCultureInfo.cs +++ b/src/benchmarks/micro/libraries/System.Globalization/Perf.DateTimeCultureInfo.cs @@ -13,7 +13,7 @@ namespace System.Globalization.Tests /// /// Primary methods affected: Parse, ToString /// - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_DateTimeCultureInfo { private readonly DateTime _time = new DateTime(654321098765432109); diff --git a/src/benchmarks/micro/libraries/System.Globalization/Perf.NumberCultureInfo.cs b/src/benchmarks/micro/libraries/System.Globalization/Perf.NumberCultureInfo.cs index 112384d79a2..7badbdb2338 100644 --- a/src/benchmarks/micro/libraries/System.Globalization/Perf.NumberCultureInfo.cs +++ b/src/benchmarks/micro/libraries/System.Globalization/Perf.NumberCultureInfo.cs @@ -11,7 +11,7 @@ namespace System.Globalization.Tests /// /// Performance tests for converting numbers to different CultureInfos /// - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_NumberCultureInfo { public IEnumerable Cultures() diff --git a/src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs b/src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs index ccfb464851a..2034551a364 100644 --- a/src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs +++ b/src/benchmarks/micro/libraries/System.Globalization/StringEquality.cs @@ -11,7 +11,7 @@ namespace System.Globalization.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] public class StringEquality { private string _value, _same, _sameUpper, _diffAtFirstChar; diff --git a/src/benchmarks/micro/libraries/System.Globalization/StringHash.cs b/src/benchmarks/micro/libraries/System.Globalization/StringHash.cs index 47123d55841..bf524c8dd52 100644 --- a/src/benchmarks/micro/libraries/System.Globalization/StringHash.cs +++ b/src/benchmarks/micro/libraries/System.Globalization/StringHash.cs @@ -11,7 +11,7 @@ namespace System.Globalization.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] public class StringHash { public static IEnumerable<(CultureInfo CultureInfo, CompareOptions CompareOptions)> GetOptions() diff --git a/src/benchmarks/micro/libraries/System.Globalization/StringSearch.cs b/src/benchmarks/micro/libraries/System.Globalization/StringSearch.cs index bdbb9bbd96b..13c6f1fcb3d 100644 --- a/src/benchmarks/micro/libraries/System.Globalization/StringSearch.cs +++ b/src/benchmarks/micro/libraries/System.Globalization/StringSearch.cs @@ -9,7 +9,7 @@ namespace System.Globalization.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] public class StringSearch { private string _value, _diffAtFirstChar, _diffAtLastChar, _firstHalf, _secondHalf; diff --git a/src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs b/src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs index b839dfcfdbd..1e2ba64d57a 100644 --- a/src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs +++ b/src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs @@ -7,7 +7,7 @@ namespace System.IO.Compression { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Brotli : CompressionStreamPerfTestBase { private const int Window = 22; diff --git a/src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs b/src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs index 2b5c291ddae..98a857cccb0 100644 --- a/src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs +++ b/src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs @@ -22,7 +22,7 @@ public class Deflate : CompressionStreamPerfTestBase // Brotli has a dedicated file with more benchmarks - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public abstract class CompressionStreamPerfTestBase { public abstract Stream CreateStream(Stream stream, CompressionMode mode); diff --git a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.Directory.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.Directory.cs index 540c3f1d636..e65c6369014 100644 --- a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.Directory.cs +++ b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.Directory.cs @@ -10,7 +10,7 @@ namespace System.IO.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Directory { private const int CreateInnerIterations = 10; diff --git a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs index 7a795876a5f..f1430ee8535 100644 --- a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs +++ b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.File.cs @@ -8,7 +8,7 @@ namespace System.IO.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_File { private const int DeleteteInnerIterations = 10; diff --git a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileInfo.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileInfo.cs index cc5739f1221..4aa90a02e32 100644 --- a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileInfo.cs +++ b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileInfo.cs @@ -7,7 +7,7 @@ namespace System.IO.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_FileInfo { private readonly string _path = FileUtils.GetTestFilePath(); diff --git a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs index 29241c8874b..3a1aff8b5a7 100644 --- a/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs +++ b/src/benchmarks/micro/libraries/System.IO.FileSystem/Perf.FileStream.cs @@ -8,7 +8,7 @@ namespace System.IO.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_FileStream { private const int DefaultBufferSize = 4096; diff --git a/src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs b/src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs index baaa4b95bf2..8b28406c832 100644 --- a/src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs +++ b/src/benchmarks/micro/libraries/System.IO.MemoryMappedFiles/Perf.MemoryMappedFile.cs @@ -10,7 +10,7 @@ namespace System.IO.MemoryMappedFiles.Tests /// /// Performance tests for the construction and disposal of MemoryMappedFiles of varying sizes /// - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_MemoryMappedFile { private TempFile _file; diff --git a/src/benchmarks/micro/libraries/System.IO.Pipelines/Perf.Pipe.cs b/src/benchmarks/micro/libraries/System.IO.Pipelines/Perf.Pipe.cs index 182963fa7d8..44e32729eda 100644 --- a/src/benchmarks/micro/libraries/System.IO.Pipelines/Perf.Pipe.cs +++ b/src/benchmarks/micro/libraries/System.IO.Pipelines/Perf.Pipe.cs @@ -9,7 +9,7 @@ namespace System.IO.Pipelines.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Pipe { private const int InnerIterationCount = 10_000; diff --git a/src/benchmarks/micro/libraries/System.IO.Pipelines/PipeThroughputBenchmark.cs b/src/benchmarks/micro/libraries/System.IO.Pipelines/PipeThroughputBenchmark.cs index c763eab85e5..a49c2fc053e 100644 --- a/src/benchmarks/micro/libraries/System.IO.Pipelines/PipeThroughputBenchmark.cs +++ b/src/benchmarks/micro/libraries/System.IO.Pipelines/PipeThroughputBenchmark.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class PipeThroughputBenchmark { private const int InnerLoopCount = 512; diff --git a/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.PipeTest.cs b/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.PipeTest.cs index 967c541ade7..875e66f4e42 100644 --- a/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.PipeTest.cs +++ b/src/benchmarks/micro/libraries/System.IO.Pipes/Perf.PipeTest.cs @@ -10,7 +10,7 @@ namespace System.IO.Pipes.Tests { [AllowedOperatingSystems("Hangs on non-Windows, dotnet/corefx#18290", OS.Windows)] - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public abstract class Perf_PipeTest : PipeTestBase { [Params(1000000)] diff --git a/src/benchmarks/micro/libraries/System.Linq/Perf.Enumerable.cs b/src/benchmarks/micro/libraries/System.Linq/Perf.Enumerable.cs index e62e5c79643..0d07988e4bc 100644 --- a/src/benchmarks/micro/libraries/System.Linq/Perf.Enumerable.cs +++ b/src/benchmarks/micro/libraries/System.Linq/Perf.Enumerable.cs @@ -9,7 +9,7 @@ namespace System.Linq.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.LINQ)] + [BenchmarkCategory(Categories.Libraries, Categories.LINQ)] public class Perf_Enumerable { private readonly Consumer _consumer = new Consumer(); diff --git a/src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs b/src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs index aa8125b1465..eaa2f2e640c 100644 --- a/src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs +++ b/src/benchmarks/micro/libraries/System.Linq/Perf.OrderBy.cs @@ -122,7 +122,7 @@ public static Person[] Generate(int count) }; } - [BenchmarkCategory(Categories.CoreFX, Categories.LINQ)] + [BenchmarkCategory(Categories.Libraries, Categories.LINQ)] public class Perf_OrderBy { private readonly Consumer _consumer = new Consumer(); diff --git a/src/benchmarks/micro/libraries/System.Memory/Constructors.cs b/src/benchmarks/micro/libraries/System.Memory/Constructors.cs index 43ff33dde54..6083d0eb8e9 100644 --- a/src/benchmarks/micro/libraries/System.Memory/Constructors.cs +++ b/src/benchmarks/micro/libraries/System.Memory/Constructors.cs @@ -11,7 +11,7 @@ namespace System.Memory { [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(string))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class Constructors { private const int Size = 10; @@ -99,7 +99,7 @@ public Constructors() [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(int))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class Constructors_ValueTypesOnly { private const int Size = 10; diff --git a/src/benchmarks/micro/libraries/System.Memory/Memory.cs b/src/benchmarks/micro/libraries/System.Memory/Memory.cs index 77cba71f191..5951bcf8824 100644 --- a/src/benchmarks/micro/libraries/System.Memory/Memory.cs +++ b/src/benchmarks/micro/libraries/System.Memory/Memory.cs @@ -13,7 +13,7 @@ namespace System.Memory { [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(char))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class Memory { [Params(Utils.DefaultCollectionSize)] diff --git a/src/benchmarks/micro/libraries/System.Memory/MemoryMarshal.cs b/src/benchmarks/micro/libraries/System.Memory/MemoryMarshal.cs index bf91de5533f..6749d6dbbd7 100644 --- a/src/benchmarks/micro/libraries/System.Memory/MemoryMarshal.cs +++ b/src/benchmarks/micro/libraries/System.Memory/MemoryMarshal.cs @@ -13,7 +13,7 @@ namespace System.Memory { [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(int))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class MemoryMarshal where T : struct { diff --git a/src/benchmarks/micro/libraries/System.Memory/ReadOnlyMemory.cs b/src/benchmarks/micro/libraries/System.Memory/ReadOnlyMemory.cs index 2d24491fa04..5e8ef9931e4 100644 --- a/src/benchmarks/micro/libraries/System.Memory/ReadOnlyMemory.cs +++ b/src/benchmarks/micro/libraries/System.Memory/ReadOnlyMemory.cs @@ -13,7 +13,7 @@ namespace System.Memory { [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(char))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class ReadOnlyMemory { [Params(Utils.DefaultCollectionSize)] diff --git a/src/benchmarks/micro/libraries/System.Memory/ReadOnlySequence.cs b/src/benchmarks/micro/libraries/System.Memory/ReadOnlySequence.cs index b8bc64c4ab1..a44514ff6a9 100644 --- a/src/benchmarks/micro/libraries/System.Memory/ReadOnlySequence.cs +++ b/src/benchmarks/micro/libraries/System.Memory/ReadOnlySequence.cs @@ -24,7 +24,7 @@ public BufferSegment Append(System.ReadOnlyMemory memory) } } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class ReadOnlySequence { public enum SequenceKind { Single, Multiple }; diff --git a/src/benchmarks/micro/libraries/System.Memory/ReadOnlySpan.cs b/src/benchmarks/micro/libraries/System.Memory/ReadOnlySpan.cs index 968feb1defc..60a0ed35327 100644 --- a/src/benchmarks/micro/libraries/System.Memory/ReadOnlySpan.cs +++ b/src/benchmarks/micro/libraries/System.Memory/ReadOnlySpan.cs @@ -9,7 +9,7 @@ namespace System.Memory { - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class ReadOnlySpan { private readonly string _sampeString = "this is a very nice sample string"; diff --git a/src/benchmarks/micro/libraries/System.Memory/SequenceReader.cs b/src/benchmarks/micro/libraries/System.Memory/SequenceReader.cs index 9903feb7e5f..050367962f9 100644 --- a/src/benchmarks/micro/libraries/System.Memory/SequenceReader.cs +++ b/src/benchmarks/micro/libraries/System.Memory/SequenceReader.cs @@ -5,7 +5,7 @@ namespace System.Memory { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class SequenceReader { private const int Count = 10000; diff --git a/src/benchmarks/micro/libraries/System.Memory/Slice.cs b/src/benchmarks/micro/libraries/System.Memory/Slice.cs index 3708c524c53..5c16fc91686 100644 --- a/src/benchmarks/micro/libraries/System.Memory/Slice.cs +++ b/src/benchmarks/micro/libraries/System.Memory/Slice.cs @@ -10,7 +10,7 @@ namespace System.Memory { [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(string))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class Slice { private const int Size = 10; diff --git a/src/benchmarks/micro/libraries/System.Memory/Span.cs b/src/benchmarks/micro/libraries/System.Memory/Span.cs index dfe92d26536..e696e1412cc 100644 --- a/src/benchmarks/micro/libraries/System.Memory/Span.cs +++ b/src/benchmarks/micro/libraries/System.Memory/Span.cs @@ -14,7 +14,7 @@ namespace System.Memory [GenericTypeArguments(typeof(byte))] [GenericTypeArguments(typeof(char))] [GenericTypeArguments(typeof(int))] - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries, Categories.Span)] public class Span where T : struct, IComparable, IEquatable { diff --git a/src/benchmarks/micro/libraries/System.Net.Http/Perf.SocketsHttpHandler.cs b/src/benchmarks/micro/libraries/System.Net.Http/Perf.SocketsHttpHandler.cs index 281f1d1401d..15871fb6295 100644 --- a/src/benchmarks/micro/libraries/System.Net.Http/Perf.SocketsHttpHandler.cs +++ b/src/benchmarks/micro/libraries/System.Net.Http/Perf.SocketsHttpHandler.cs @@ -16,7 +16,7 @@ namespace System.Net.Http.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class SocketsHttpHandlerPerfTest { // the field names start with lowercase to keep to benchmark ID! do not change it diff --git a/src/benchmarks/micro/libraries/System.Net.NetworkInformation/NetworkInterfaceTests.cs b/src/benchmarks/micro/libraries/System.Net.NetworkInformation/NetworkInterfaceTests.cs index 4ba16d06849..5e22216809d 100644 --- a/src/benchmarks/micro/libraries/System.Net.NetworkInformation/NetworkInterfaceTests.cs +++ b/src/benchmarks/micro/libraries/System.Net.NetworkInformation/NetworkInterfaceTests.cs @@ -8,7 +8,7 @@ namespace System.Net.NetworkInformation.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class NetworkInterfaceTests { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Net.NetworkInformation/PhysicalAddressTests.cs b/src/benchmarks/micro/libraries/System.Net.NetworkInformation/PhysicalAddressTests.cs index caa5ff61304..df6f87f1093 100644 --- a/src/benchmarks/micro/libraries/System.Net.NetworkInformation/PhysicalAddressTests.cs +++ b/src/benchmarks/micro/libraries/System.Net.NetworkInformation/PhysicalAddressTests.cs @@ -8,7 +8,7 @@ namespace System.Net.NetworkInformation.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class PhysicalAddressTests { private readonly PhysicalAddress _short = new PhysicalAddress(new byte[1] { 42 }); diff --git a/src/benchmarks/micro/libraries/System.Net.Primitives/CredentialCacheTests.cs b/src/benchmarks/micro/libraries/System.Net.Primitives/CredentialCacheTests.cs index a2fe9419840..5978713a9d7 100644 --- a/src/benchmarks/micro/libraries/System.Net.Primitives/CredentialCacheTests.cs +++ b/src/benchmarks/micro/libraries/System.Net.Primitives/CredentialCacheTests.cs @@ -9,7 +9,7 @@ namespace System.Net.Primitives.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class CredentialCacheTests { private const string UriPrefix = "http://name"; diff --git a/src/benchmarks/micro/libraries/System.Net.Primitives/DnsTests.cs b/src/benchmarks/micro/libraries/System.Net.Primitives/DnsTests.cs index 8da50bc51cf..25229800919 100644 --- a/src/benchmarks/micro/libraries/System.Net.Primitives/DnsTests.cs +++ b/src/benchmarks/micro/libraries/System.Net.Primitives/DnsTests.cs @@ -7,7 +7,7 @@ namespace System.Net.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class DnsTests { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Net.Primitives/IPAddressPerformanceTests.cs b/src/benchmarks/micro/libraries/System.Net.Primitives/IPAddressPerformanceTests.cs index 435349cb3b8..f1a64af4307 100644 --- a/src/benchmarks/micro/libraries/System.Net.Primitives/IPAddressPerformanceTests.cs +++ b/src/benchmarks/micro/libraries/System.Net.Primitives/IPAddressPerformanceTests.cs @@ -11,7 +11,7 @@ namespace System.Net.Primitives.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class IPAddressPerformanceTests { public static IEnumerable ByteAddresses() diff --git a/src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs b/src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs index 5bf3712fbed..6056edf6380 100644 --- a/src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs +++ b/src/benchmarks/micro/libraries/System.Net.Security/SslStreamTests.cs @@ -12,7 +12,7 @@ namespace System.Net.Security.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class SslStreamTests { private readonly Barrier _twoParticipantBarrier = new Barrier(2); diff --git a/src/benchmarks/micro/libraries/System.Net.Sockets/Perf.Socket.SendReceive.cs b/src/benchmarks/micro/libraries/System.Net.Sockets/Perf.Socket.SendReceive.cs index 053155b3d0d..833e76ede34 100644 --- a/src/benchmarks/micro/libraries/System.Net.Sockets/Perf.Socket.SendReceive.cs +++ b/src/benchmarks/micro/libraries/System.Net.Sockets/Perf.Socket.SendReceive.cs @@ -12,7 +12,7 @@ namespace System.Net.Sockets.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class SocketSendReceivePerfTest { private const int InnerIterationCount = 10_000; diff --git a/src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorConstructorTests.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorConstructorTests.cs index 6ba4e41d734..550a0e64835 100644 --- a/src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorConstructorTests.cs +++ b/src/benchmarks/micro/libraries/System.Numerics.Vectors/GenericVectorConstructorTests.cs @@ -8,7 +8,7 @@ namespace System.Numerics.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.SIMD)] + [BenchmarkCategory(Categories.Libraries, Categories.SIMD)] public partial class Constructor { Byte[] _arrValues_Byte = GenerateRandomValuesForVector(Byte.MinValue, Byte.MaxValue); diff --git a/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector2.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector2.cs index 21708167115..98099fce970 100644 --- a/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector2.cs +++ b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector2.cs @@ -8,7 +8,7 @@ namespace System.Numerics.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.SIMD)] + [BenchmarkCategory(Categories.Libraries, Categories.SIMD)] public class Perf_Vector2 { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector3.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector3.cs index 3693d08fccc..3c51a26a5a6 100644 --- a/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector3.cs +++ b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector3.cs @@ -7,7 +7,7 @@ namespace System.Numerics.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.SIMD)] + [BenchmarkCategory(Categories.Libraries, Categories.SIMD)] public class Perf_Vector3 { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector4.cs b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector4.cs index b27a149bb5a..db7a3fa432b 100644 --- a/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector4.cs +++ b/src/benchmarks/micro/libraries/System.Numerics.Vectors/Perf_Vector4.cs @@ -7,7 +7,7 @@ namespace System.Numerics.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.SIMD)] + [BenchmarkCategory(Categories.Libraries, Categories.SIMD)] public class Perf_Vector4 { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Convert.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Convert.cs index 115f10a99ce..580945370f0 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Convert.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Convert.cs @@ -8,7 +8,7 @@ namespace System { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Convert { private static byte[] InitializeBinaryDataCollection(int size) diff --git a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Environment.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Environment.cs index adda481d98c..480ae30b288 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Environment.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Environment.cs @@ -8,7 +8,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Environment { private const string Key = "7efd538f-dcab-4806-839a-972bc463a90c"; diff --git a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Path.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Path.cs index 7268c447499..aa2033c36fc 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Path.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Path.cs @@ -7,7 +7,7 @@ namespace System.IO.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Path { private readonly string _testPath = FileUtils.GetTestFilePath(); diff --git a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Random.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Random.cs index 8bb49e4768a..c38ce3902f6 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Random.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.Random.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Random { Random _random = new Random(123456); diff --git a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.StreamWriter.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.StreamWriter.cs index 0b7b152ee5b..1dd28880408 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.StreamWriter.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.StreamWriter.cs @@ -9,7 +9,7 @@ namespace System.IO.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_StreamWriter { private const int MemoryStreamSize = 32768; diff --git a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.WebUtility.cs b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.WebUtility.cs index 05357dbab37..47870317bff 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.WebUtility.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Extensions/Perf.WebUtility.cs @@ -7,7 +7,7 @@ namespace System.Net.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_WebUtility { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Runtime.InteropServices/SafeHandleTests.cs b/src/benchmarks/micro/libraries/System.Runtime.InteropServices/SafeHandleTests.cs index 7a0ec88796a..23740ba7fdc 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.InteropServices/SafeHandleTests.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.InteropServices/SafeHandleTests.cs @@ -8,7 +8,7 @@ namespace System.Runtime.InteropServices.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class SafeHandleTests { private readonly SafeFileHandle _sfh = new SafeFileHandle((IntPtr)12345, ownsHandle: false); diff --git a/src/benchmarks/micro/libraries/System.Runtime.Numerics/Perf.BigInteger.cs b/src/benchmarks/micro/libraries/System.Runtime.Numerics/Perf.BigInteger.cs index 0afb75ebeff..f39b29320f0 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Numerics/Perf.BigInteger.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Numerics/Perf.BigInteger.cs @@ -9,7 +9,7 @@ namespace System.Numerics.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_BigInteger { public IEnumerable NumberStrings() diff --git a/src/benchmarks/micro/libraries/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs b/src/benchmarks/micro/libraries/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs index 6138570b17c..f7ede437d79 100644 --- a/src/benchmarks/micro/libraries/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs +++ b/src/benchmarks/micro/libraries/System.Runtime.Serialization.Formatters/Perf.BinaryFormatter.cs @@ -11,7 +11,7 @@ namespace System.Runtime.Serialization.Formatters.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_BinaryFormatter { private readonly BinaryFormatter _formatter = new BinaryFormatter(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Array.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Array.cs index 87ee07d3b38..2df0a891d45 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Array.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Array.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries)] public class Perf_Array { private static Array s_arr1; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Boolean.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Boolean.cs index 5090b836a03..50a09595f3c 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Boolean.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Boolean.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Boolean { public static IEnumerable StringValues => Values.Select(value => value.ToString()).ToArray(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Byte.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Byte.cs index 8d5e861a880..94d65154797 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Byte.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Byte.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Byte { public static IEnumerable StringValues => Values.Select(value => value.ToString()).ToArray(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Char.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Char.cs index 9efdf8e4c84..d6a5aecee8a 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Char.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Char.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Char { public static IEnumerable Char_ChangeCase_MemberData() diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTime.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTime.cs index 94b398f56f0..57c897cb479 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTime.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTime.cs @@ -8,7 +8,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_DateTime { DateTime date1 = new DateTime(1996, 6, 3, 22, 15, 0); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTimeOffset.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTimeOffset.cs index 0afd81f6ebb..a3cc20f7ced 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTimeOffset.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.DateTimeOffset.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_DateTimeOffset { DateTimeOffset date1 = new DateTimeOffset(new DateTime(1996, 6, 3, 22, 15, 0), new TimeSpan(5, 0, 0)); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Decimal.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Decimal.cs index db7eea4841d..fae53e492c7 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Decimal.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Decimal.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Decimal { public static IEnumerable Values => new object[] diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Double.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Double.cs index f2067e56369..229076f8642 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Double.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Double.cs @@ -10,7 +10,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Double { private readonly string[] _formats = { "R", "G", "G17", "E", "F50" }; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Enum.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Enum.cs index 408f9c6527e..a2b6152b393 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Enum.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Enum.cs @@ -8,7 +8,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Enum { [Flags] diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Guid.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Guid.cs index 108ec9a36db..0c968260851 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Guid.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Guid.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Guid { const string guidStr = "a8a110d5-fc49-43c5-bf46-802db8f843ff"; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.HashCode.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.HashCode.cs index 23a7a074d46..a214aeb72de 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.HashCode.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.HashCode.cs @@ -8,7 +8,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_HashCode { private static volatile int _valueStorage; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Int16.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int16.cs index b59bb0ff858..1203a0cb2be 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Int16.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int16.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Int16 { public static IEnumerable StringValues => Values.Select(value => value.ToString()).ToArray(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Int32.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int32.cs index 8c13a02dce4..262651b9ac5 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Int32.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int32.cs @@ -10,7 +10,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Int32 { private char[] _destination = new char[int.MinValue.ToString().Length]; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Int64.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int64.cs index 3e16271c38c..e24959b851d 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Int64.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Int64.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Int64 { private char[] _destination = new char[long.MinValue.ToString().Length]; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.IntPtr.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.IntPtr.cs index f67593a450e..3ce261f90af 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.IntPtr.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.IntPtr.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_IntPtr { IntPtr ptr1 = new IntPtr(0); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Lazy.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Lazy.cs index 35e06adfe69..03b1c2944f8 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Lazy.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Lazy.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Lazy { private Lazy _lazy; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Object.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Object.cs index a9a4cf9b2f6..79d2aca9d1c 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Object.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Object.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Object { object obj = new object(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.SByte.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.SByte.cs index 26ce8995da2..da2772c5ee3 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.SByte.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.SByte.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_SByte { public static IEnumerable StringValues => Values.Select(value => value.ToString()).ToArray(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Single.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Single.cs index e2a4f736483..b23cd110ce0 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Single.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Single.cs @@ -10,7 +10,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Single { private readonly string[] _formats = { "R", "G", "G17", "E", "F50" }; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.String.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.String.cs index f6af184d217..b886bcbfd2e 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.String.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.String.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries)] public class Perf_String { // the culture-specific methods are tested in Perf_StringCultureSpecific class diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.TimeSpan.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.TimeSpan.cs index 3ad3c05a41d..ea6209f24b3 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.TimeSpan.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.TimeSpan.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_TimeSpan { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Type.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Type.cs index 0e33bfbe088..57dc049fe35 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Type.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Type.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Type { RuntimeTypeHandle TypeHandle = typeof(int).TypeHandle; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt16.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt16.cs index 20277207909..0af8b6616f3 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt16.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt16.cs @@ -9,7 +9,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_UInt16 { public static IEnumerable StringValues => Values.Select(value => value.ToString()).ToArray(); diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt32.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt32.cs index ed1f630dcf2..bb8e39ff18f 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt32.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt32.cs @@ -10,7 +10,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_UInt32 { private char[] _destination = new char[uint.MaxValue.ToString().Length]; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt64.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt64.cs index f526e9c7b49..1c97729cb6b 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt64.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.UInt64.cs @@ -10,7 +10,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_UInt64 { private char[] _destination = new char[ulong.MaxValue.ToString().Length]; diff --git a/src/benchmarks/micro/libraries/System.Runtime/Perf.Uri.cs b/src/benchmarks/micro/libraries/System.Runtime/Perf.Uri.cs index ca7baa8da3c..9a2cfc9b0ac 100644 --- a/src/benchmarks/micro/libraries/System.Runtime/Perf.Uri.cs +++ b/src/benchmarks/micro/libraries/System.Runtime/Perf.Uri.cs @@ -7,7 +7,7 @@ namespace System.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Uri { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs index 7c4a0e6d7df..7bafadae38a 100644 --- a/src/benchmarks/micro/libraries/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs +++ b/src/benchmarks/micro/libraries/System.Security.Cryptography.Primitives/Perf.FixedTimeEquals.cs @@ -8,7 +8,7 @@ namespace System.Security.Cryptography.Primitives.Tests.Performance { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_FixedTimeEquals { byte[] baseValue, errorVector; diff --git a/src/benchmarks/micro/libraries/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs index 2299d64c0c9..8224aae1c72 100644 --- a/src/benchmarks/micro/libraries/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs +++ b/src/benchmarks/micro/libraries/System.Security.Cryptography.X509Certificates/X509Certificate2Tests.cs @@ -10,7 +10,7 @@ namespace System.Security.Cryptography.X509Certificates.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class X509Certificate2Tests { private readonly X509Certificate2 _cert = GetMicrosoftComCert(); diff --git a/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.CryptoConfig.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.CryptoConfig.cs index 9bd96316dd8..b4379a76a62 100644 --- a/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.CryptoConfig.cs +++ b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.CryptoConfig.cs @@ -7,7 +7,7 @@ namespace System.Security.Cryptography.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_CryptoConfig { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Hashing.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Hashing.cs index 2a4bfda63c6..0abf7926a50 100644 --- a/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Hashing.cs +++ b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Hashing.cs @@ -8,7 +8,7 @@ namespace System.Security.Cryptography.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Hashing { private readonly byte[] _data = ValuesGenerator.Array(100 * 1024 * 1024); diff --git a/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs index 01f61688c07..ab97c3a26b2 100644 --- a/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs +++ b/src/benchmarks/micro/libraries/System.Security.Cryptography/Perf.Rfc2898DeriveBytes.cs @@ -7,7 +7,7 @@ namespace System.Security.Cryptography.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Rfc2898DeriveBytes { private static readonly Rfc2898DeriveBytes s_db = new Rfc2898DeriveBytes("verysafepassword", 32, 10_000, HashAlgorithmName.SHA256); diff --git a/src/benchmarks/micro/libraries/System.Text.Encoding/Perf.Encoding.cs b/src/benchmarks/micro/libraries/System.Text.Encoding/Perf.Encoding.cs index 96d5a32951e..4f47ccbbb4e 100644 --- a/src/benchmarks/micro/libraries/System.Text.Encoding/Perf.Encoding.cs +++ b/src/benchmarks/micro/libraries/System.Text.Encoding/Perf.Encoding.cs @@ -7,7 +7,7 @@ namespace System.Text.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Encoding { [Params(16, 512)] diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadJson.cs b/src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadJson.cs index 1f4005548a3..144d5e48356 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadJson.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Serializer/ReadJson.cs @@ -43,15 +43,15 @@ public async Task Setup() await JsonSerializer.SerializeAsync(_memoryStream, value); } - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public T DeserializeFromString() => JsonSerializer.Deserialize(_serialized); - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public T DeserializeFromUtf8Bytes() => JsonSerializer.Deserialize(_utf8Serialized); - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public async Task DeserializeFromStream() { diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs b/src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs index 8cdf9d42d08..e4b15c9d770 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Serializer/WriteJson.cs @@ -41,15 +41,15 @@ public async Task Setup() _objectWithObjectProperty = new { Prop = (object)_value }; } - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public string SerializeToString() => JsonSerializer.Serialize(_value); - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public byte[] SerializeToUtf8Bytes() => JsonSerializer.SerializeToUtf8Bytes(_value); - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public async Task SerializeToStream() { @@ -57,7 +57,7 @@ public async Task SerializeToStream() await JsonSerializer.SerializeAsync(_memoryStream, _value); } - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] [Benchmark] public string SerializeObjectProperty() => JsonSerializer.Serialize(_objectWithObjectProperty); diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs index ef4b4b1d93c..34c5c44e88f 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Base64.cs @@ -10,7 +10,7 @@ namespace System.Text.Json.Reader.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Base64 { private byte[] _base64NoEscaping; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs index 4c16df77788..663443c260e 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Depth.cs @@ -11,7 +11,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Depth { private byte[] _dataUtf8; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs index f9b8c7a35e5..a3db928f15d 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Reader.cs @@ -13,7 +13,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Reader { // Keep the JsonStrings resource names in sync with TestCaseType enum values. diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Segment.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Segment.cs index 524787c6be9..409904dcce7 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Segment.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Perf.Segment.cs @@ -9,7 +9,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Segment { // Keep the JsonStrings resource names in sync with TestCaseType enum values. diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs index 7c3de3c732d..8545d96aae6 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonReader/Utf8JsonReader.Comments.Tests.cs @@ -10,7 +10,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public partial class Utf8JsonReaderCommentsTests { [Params(JsonCommentHandling.Skip, JsonCommentHandling.Allow)] diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs index ed92db9181d..bf6ddce3487 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Base64.cs @@ -9,7 +9,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Base64 { private ArrayBufferWriter _arrayBufferWriter; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs index 2e65b49f698..ff37f44d93c 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Basic.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Basic { private static readonly byte[] ExtraArrayUtf8 = Encoding.UTF8.GetBytes("ExtraArray"); diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs index 252554bae27..e66c34179cb 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Booleans.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Booleans { private const int DataSize = 100_000; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs index 6915a7f3793..4acbb961eeb 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Ctor.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Ctor { private ArrayBufferWriter _arrayBufferWriter; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs index 2da8c95f5ca..1580cbec4a2 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.DateTimes.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_DateTimes { private const int DataSize = 100_000; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs index f88caae5ee6..cac13b1de66 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Deep.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Deep { private static readonly byte[] ExtraArrayUtf8 = Encoding.UTF8.GetBytes("ExtraArray"); diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs index a2f1258a44d..bf43918cf26 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Doubles.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Doubles { private const int DataSize = 100_000; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs index db64c1be84b..491b7c62b9c 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Guids.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Guids { private const int DataSize = 100_000; diff --git a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs index a36dcaa1a19..e58c6f71952 100644 --- a/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs +++ b/src/benchmarks/micro/libraries/System.Text.Json/Utf8JsonWriter/Perf.Strings.cs @@ -8,7 +8,7 @@ namespace System.Text.Json.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.JSON)] + [BenchmarkCategory(Categories.Libraries, Categories.JSON)] public class Perf_Strings { private const int DataSize = 100_000; diff --git a/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs b/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs index 8c1dd56ec09..387264ab4b7 100644 --- a/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs +++ b/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Cache.cs @@ -9,7 +9,7 @@ namespace System.Text.RegularExpressions.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Regex_Cache { private const int MaxConcurrency = 4; diff --git a/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Common.cs b/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Common.cs index caee8de7147..755f570f379 100644 --- a/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Common.cs +++ b/src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Common.cs @@ -10,7 +10,7 @@ namespace System.Text.RegularExpressions.Tests /// /// Performance tests for Regular Expressions /// - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Regex_Common { private Regex _email, _date, _ip, _uri; diff --git a/src/benchmarks/micro/libraries/System.Text/Perf.StringBuilder.cs b/src/benchmarks/micro/libraries/System.Text/Perf.StringBuilder.cs index d9011717c21..8f9fbe9c2da 100644 --- a/src/benchmarks/micro/libraries/System.Text/Perf.StringBuilder.cs +++ b/src/benchmarks/micro/libraries/System.Text/Perf.StringBuilder.cs @@ -7,7 +7,7 @@ namespace System.Text.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] public class Perf_StringBuilder { const int LOHAllocatedStringSize = 100_000; diff --git a/src/benchmarks/micro/libraries/System.Threading.Channels/Perf.Channel.cs b/src/benchmarks/micro/libraries/System.Threading.Channels/Perf.Channel.cs index 6872bbb5d3b..d9128305866 100644 --- a/src/benchmarks/micro/libraries/System.Threading.Channels/Perf.Channel.cs +++ b/src/benchmarks/micro/libraries/System.Threading.Channels/Perf.Channel.cs @@ -23,7 +23,7 @@ public class BoundedChannelPerfTests : PerfTests public sealed override Channel CreateChannel() => Channel.CreateBounded(10); } - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public abstract class PerfTests { private Channel _channel, _channel1, _channel2; diff --git a/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs b/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs index a7c3fe47b70..6b10ef9cac6 100644 --- a/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs +++ b/src/benchmarks/micro/libraries/System.Threading.Tasks.Extensions/Perf.ValueTask.cs @@ -11,7 +11,7 @@ namespace System.Threading.Tasks { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] [MinWarmupCount(2, forceAutoWarmup: true)] // these benchmarks require more warmups than in our default config [MaxWarmupCount(10, forceAutoWarmup: true)] public class ValueTaskPerfTest diff --git a/src/benchmarks/micro/libraries/System.Threading.Tasks/Perf.AsyncMethods.cs b/src/benchmarks/micro/libraries/System.Threading.Tasks/Perf.AsyncMethods.cs index b727c80a4ef..efc6fac81ea 100644 --- a/src/benchmarks/micro/libraries/System.Threading.Tasks/Perf.AsyncMethods.cs +++ b/src/benchmarks/micro/libraries/System.Threading.Tasks/Perf.AsyncMethods.cs @@ -9,7 +9,7 @@ namespace System.Threading.Tasks.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_AsyncMethods { [Benchmark(OperationsPerInvoke = 100_000)] diff --git a/src/benchmarks/micro/libraries/System.Threading.ThreadPool/Perf.ThreadPool.cs b/src/benchmarks/micro/libraries/System.Threading.ThreadPool/Perf.ThreadPool.cs index 4a4ed5f441a..0d17f4b1839 100644 --- a/src/benchmarks/micro/libraries/System.Threading.ThreadPool/Perf.ThreadPool.cs +++ b/src/benchmarks/micro/libraries/System.Threading.ThreadPool/Perf.ThreadPool.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public partial class Perf_ThreadPool { [Params(20_000_000)] diff --git a/src/benchmarks/micro/libraries/System.Threading.Timers/Perf.Timer.cs b/src/benchmarks/micro/libraries/System.Threading.Timers/Perf.Timer.cs index dbf8cdccc3e..c92bf79eee8 100644 --- a/src/benchmarks/micro/libraries/System.Threading.Timers/Perf.Timer.cs +++ b/src/benchmarks/micro/libraries/System.Threading.Timers/Perf.Timer.cs @@ -8,7 +8,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Timer { private readonly Timer[] _timers = new Timer[1_000_000]; diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.CancellationToken.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.CancellationToken.cs index 70e310bdf05..10b47c211fb 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.CancellationToken.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.CancellationToken.cs @@ -8,7 +8,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_CancellationToken { private readonly CancellationToken _token = new CancellationTokenSource().Token; diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.EventWaitHandle.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.EventWaitHandle.cs index ccd45f1d14a..50f02178bc2 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.EventWaitHandle.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.EventWaitHandle.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_EventWaitHandle { private EventWaitHandle _are; diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.Interlocked.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Interlocked.cs index 3db3f02a04b..f3755687795 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.Interlocked.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.Interlocked.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX, Categories.CoreCLR)] + [BenchmarkCategory(Categories.Libraries, Categories.Runtime)] public class Perf_Interlocked { private int _int = 0; diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.Lock.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Lock.cs index 4d44486cfb9..f26a1d1336b 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.Lock.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.Lock.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Lock { ReaderWriterLockSlim _rwLock = new ReaderWriterLockSlim(); diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.Monitor.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Monitor.cs index a06901337ea..42023a3c220 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.Monitor.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.Monitor.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Monitor { object _sync = new object(); diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.SpinLock.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.SpinLock.cs index 44b65cd989e..f12503e97d5 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.SpinLock.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.SpinLock.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_SpinLock { private SpinLock _spinLock = new SpinLock(enableThreadOwnerTracking: false); diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.Thread.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Thread.cs index 7267743c37d..fa4bf80d430 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.Thread.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.Thread.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Thread { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.ThreadStatic.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.ThreadStatic.cs index 25eae95c20a..2f91553d2fb 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.ThreadStatic.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.ThreadStatic.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_ThreadStatic { [Benchmark] diff --git a/src/benchmarks/micro/libraries/System.Threading/Perf.Volatile.cs b/src/benchmarks/micro/libraries/System.Threading/Perf.Volatile.cs index e26f5790551..710adb3dc94 100644 --- a/src/benchmarks/micro/libraries/System.Threading/Perf.Volatile.cs +++ b/src/benchmarks/micro/libraries/System.Threading/Perf.Volatile.cs @@ -7,7 +7,7 @@ namespace System.Threading.Tests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_Volatile { private double _location = 0; diff --git a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XDocument.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XDocument.cs index 275bc78a11a..e99a4344792 100644 --- a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XDocument.cs +++ b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XDocument.cs @@ -7,7 +7,7 @@ namespace System.Xml.Linq { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XDocument { private XDocument _doc; diff --git a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElement.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElement.cs index 172ebb36cbd..cdab11370db 100644 --- a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElement.cs +++ b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElement.cs @@ -7,7 +7,7 @@ namespace System.Xml.Linq { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XElement { private XElement _element; diff --git a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElementList.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElementList.cs index 9a8a87a4795..bda2e77dd5e 100644 --- a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElementList.cs +++ b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XElementList.cs @@ -9,7 +9,7 @@ namespace System.Xml.Linq { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XElementList { private readonly Consumer _consumer = new Consumer(); diff --git a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XName.cs b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XName.cs index e315581bd13..5e3245b77fe 100644 --- a/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XName.cs +++ b/src/benchmarks/micro/libraries/System.Xml.Linq/Perf.XName.cs @@ -7,7 +7,7 @@ namespace System.Xml.Linq { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XName { private XName _noNamespace; diff --git a/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlDocument.cs b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlDocument.cs index 60dcdcd56c4..4f9d4b1aa82 100644 --- a/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlDocument.cs +++ b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlDocument.cs @@ -8,7 +8,7 @@ namespace XmlDocumentTests.XmlDocumentTests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XmlDocument { private XmlDocument _doc; diff --git a/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNode.cs b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNode.cs index 279e1220dff..b9fae555701 100644 --- a/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNode.cs +++ b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNode.cs @@ -8,7 +8,7 @@ namespace XmlDocumentTests.XmlNodeTests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XmlNode { private XmlNode _node; diff --git a/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNodeList.cs b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNodeList.cs index b6dc5a9f6cc..51183c21b1b 100644 --- a/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNodeList.cs +++ b/src/benchmarks/micro/libraries/System.Xml.XmlDocument/Perf.XmlNodeList.cs @@ -9,7 +9,7 @@ namespace XmlDocumentTests.XmlNodeListTests { - [BenchmarkCategory(Categories.CoreFX)] + [BenchmarkCategory(Categories.Libraries)] public class Perf_XmlNodeList { private readonly Consumer _consumer = new Consumer(); diff --git a/src/benchmarks/micro/libraries/System/Hashing.cs b/src/benchmarks/micro/libraries/System/Hashing.cs index 8a1096730c3..10c05f93290 100644 --- a/src/benchmarks/micro/libraries/System/Hashing.cs +++ b/src/benchmarks/micro/libraries/System/Hashing.cs @@ -8,7 +8,7 @@ namespace System { - [BenchmarkCategory(Categories.CoreCLR, Categories.CoreFX)] + [BenchmarkCategory(Categories.Runtime, Categories.Libraries)] public class Hashing { private string _string; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-2.cs index 7a97af87fc0..70d1f37063b 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-2.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-2.cs @@ -20,7 +20,7 @@ contributed by Marek Safar namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class BinaryTrees_2 { const int minDepth = 4; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-5.cs b/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-5.cs index 1107b11cee7..eae1ebf8bbb 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-5.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/binarytrees-5.cs @@ -25,7 +25,7 @@ minor improvements by Alex Yakunin namespace BenchmarksGame { [MaxIterationCount(40)] // the default 20 is not enough, the benchmark has multimodal distribution and needs more runs - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class BinaryTrees_5 { public const int MinDepth = 4; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-2.cs index 826be16324e..c8747affd10 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-2.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-2.cs @@ -18,7 +18,7 @@ namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class FannkuchRedux_2 { [Benchmark(Description = nameof(FannkuchRedux_2))] diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-5.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-5.cs index 36b5286d662..a12763491b3 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-5.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/fannkuch-redux-5.cs @@ -23,7 +23,7 @@ parallel and small optimisations by Anthony Lloyd namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class FannkuchRedux_5 { static int[] fact, chkSums, maxFlips; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs index 4700d92dc3e..b1f06e75972 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/fasta-1.cs @@ -29,7 +29,7 @@ modified by Josh Goldfoot (fasta-repeat buffering) namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class Fasta_1 { const int LineLength = 60; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs index 095da8ffe9a..9c2cf67433c 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/fasta-2.cs @@ -22,7 +22,7 @@ optimizations by Alp Toker namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class Fasta_2 { [Benchmark(Description = nameof(Fasta_2))] diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-1.cs index 0cfc0b29852..9fad1a38832 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-1.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-1.cs @@ -82,7 +82,7 @@ public static byte[] GetBytes(this List input) } } - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class KNucleotide_1 { private NucleotideHelpers _nucleotideHarnessHelpers = new NucleotideHelpers(bigInput: true); diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-9.cs b/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-9.cs index a6ce9be0b3b..ca85c70f9b0 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-9.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/k-nucleotide-9.cs @@ -28,7 +28,7 @@ namespace BenchmarksGame { class Wrapper { public int v = 1; } - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class KNucleotide_9 { const int BLOCK_SIZE = 1024 * 1024 * 8; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-2.cs b/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-2.cs index bfb25ccbb8f..c8fbbee81ca 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-2.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-2.cs @@ -21,7 +21,7 @@ namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class Mandelbrot_2 { // Commented out data left in source to provide checksums for each case diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-7.cs b/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-7.cs index ea57eb82c15..e85af4f431e 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-7.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/mandelbrot-7.cs @@ -29,7 +29,7 @@ optimized to use Vector by Tanner Gooding namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class MandelBrot_7 { // Vector.Count is treated as a constant by the JIT, don't bother diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/n-body-3.cs b/src/benchmarks/micro/runtime/BenchmarksGame/n-body-3.cs index b9cd0e2e57d..4cb4fe9584d 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/n-body-3.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/n-body-3.cs @@ -20,7 +20,7 @@ namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class NBody_3 { [Benchmark(Description = nameof(NBody_3))] diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/pidigits-3.cs b/src/benchmarks/micro/runtime/BenchmarksGame/pidigits-3.cs index d1d3812cb93..1efe211b6ea 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/pidigits-3.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/pidigits-3.cs @@ -133,7 +133,7 @@ public static StringBuilder Bench(int n, bool verbose) } } - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class PiDigits_3 { [Benchmark(Description = nameof(PiDigits_3))] diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-1.cs index 1595ed03981..d7167ebb5e9 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-1.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-1.cs @@ -22,7 +22,7 @@ namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class RegexRedux_1 { private string _sequences; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-5.cs b/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-5.cs index 01b91c7f529..eff569ad346 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-5.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/regex-redux-5.cs @@ -22,7 +22,7 @@ order variants by execution time by Anthony Lloyd namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class RegexRedux_5 { private string _sequences; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-1.cs index 82e2d2889d2..18976d61041 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-1.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-1.cs @@ -21,7 +21,7 @@ contributed by Robert F. Tobler to process large blocks of byte arrays namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class ReverseComplement_1 { struct Block diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-6.cs b/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-6.cs index 1ba93c49dac..da9e4de1fd6 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-6.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/reverse-complement-6.cs @@ -32,7 +32,7 @@ class RevCompSequence public Thread ReverseThread; } - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class ReverseComplement_6 { const int READER_BUFFER_SIZE = 1024 * 1024; diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-1.cs b/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-1.cs index 0742e5527e9..17562deffd7 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-1.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-1.cs @@ -20,7 +20,7 @@ contributed by Isaac Gouy namespace BenchmarksGame { - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class SpectralNorm_1 { [Benchmark(Description = nameof(SpectralNorm_1))] diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-3.cs b/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-3.cs index 87c4a17a1b9..c95fc2bb9b3 100644 --- a/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-3.cs +++ b/src/benchmarks/micro/runtime/BenchmarksGame/spectralnorm-3.cs @@ -24,7 +24,7 @@ contributed by Isaac Gouy namespace BenchmarksGame { [MaxIterationCount(40)] // the default 20 is not enough, the benchmark has multimodal distribution and needs more runs - [BenchmarkCategory(Categories.CoreCLR, Categories.BenchmarksGame)] + [BenchmarkCategory(Categories.Runtime, Categories.BenchmarksGame)] public class SpectralNorm_3 { [Benchmark(Description = nameof(SpectralNorm_3))] diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Adams.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Adams.cs index 1dd4ec5f18d..1232243a6ba 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Adams.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Adams.cs @@ -11,7 +11,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Adams { static double g_xn, g_yn, g_dn, g_en; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMk2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMk2.cs index fef979385b3..1e55a1c1245 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMk2.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMk2.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class BenchMk2 { public const int Iterations = 4000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMrk.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMrk.cs index 1515f6313f1..8b1dd07f8f9 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMrk.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/BenchMrk.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class BenchMrk { public const int Iterations = 4000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Bisect.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Bisect.cs index 26e2e535b15..9bc08598593 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Bisect.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Bisect.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Bisect { public const int Iterations = 400000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/DMath.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/DMath.cs index c554db8469b..51c3143f0e5 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/DMath.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/DMath.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class DMath { public const int Iterations = 100000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs index ee185fafa2b..7d9788cbf5b 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/FFT.cs @@ -11,7 +11,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class FFT { public const int Iterations = 300000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/InProd.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/InProd.cs index c04d93127cc..f032c082011 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/InProd.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/InProd.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class InProd { public const int Iterations = 70; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/InvMt.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/InvMt.cs index 3c6c14674d1..d3e2bf810c2 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/InvMt.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/InvMt.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.BenchF)] public class InvMt { public const int Iterations = 80; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/LLoops.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/LLoops.cs index 6c34aed9f5b..42d553cedc5 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/LLoops.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/LLoops.cs @@ -60,7 +60,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class LLoops { public const int Iterations = 4000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Lorenz.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Lorenz.cs index 51c91eee92b..0f455a207cc 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Lorenz.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Lorenz.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Lorenz { public const int Iterations = 8000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/MatInv4.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/MatInv4.cs index e4e24b2e95c..7c71930f21e 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/MatInv4.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/MatInv4.cs @@ -7,7 +7,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class MatInv4 { public const int Iterations = 60; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtE.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtE.cs index 69dcb196c4f..593415d63f9 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtE.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtE.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class NewtE { public const int Iterations = 1000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtR.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtR.cs index 02021f039d5..025b6e49535 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtR.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/NewtR.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class NewtR { public const int Iterations = 80000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Regula.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Regula.cs index d7132ea88f3..16e90126768 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Regula.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Regula.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Regula { public const int Iterations = 4000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Romber.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Romber.cs index 8bff5ebdb8e..e775d35db7e 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Romber.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Romber.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Romber { public const int Iterations = 640000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Secant.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Secant.cs index 58078139688..0e9eadfcb99 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Secant.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Secant.cs @@ -10,7 +10,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Secant { public const int Iterations = 3000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Simpsn.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Simpsn.cs index b799c40997a..a399fc10663 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Simpsn.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Simpsn.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Simpsn { public const int Iterations = 90000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/SqMtx.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/SqMtx.cs index 5d956dd6e13..9514af3c0e8 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/SqMtx.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/SqMtx.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class SqMtx { public const int Iterations = 4000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Trap.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Trap.cs index 040411e9725..29a62bd911e 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Trap.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Trap.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Trap { public const int Iterations = 240000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchF/Whetsto.cs b/src/benchmarks/micro/runtime/Benchstones/BenchF/Whetsto.cs index cd18e014077..361342a2ff8 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchF/Whetsto.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchF/Whetsto.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchF { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchF)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchF)] public class Whetsto { public const int Iterations = 50000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/8Queens.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/8Queens.cs index b342b1b8c84..fc96845a1c8 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/8Queens.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/8Queens.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class EightQueens { static int[] m_c = new int[15]; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Ackermann.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Ackermann.cs index 1a95d13b322..f3d0060e4ef 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Ackermann.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Ackermann.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Ackermann { static int Acker(int m, int n) { diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray.cs index d94c3a961d3..0825e21ca88 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class AddArray { const int Size = 6000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray2.cs index c8970292faa..12b45376414 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray2.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/AddArray2.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class AddArray2 { private const int Dim = 200; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Array1.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Array1.cs index b4e64ae4763..ecf41c9e44a 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Array1.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Array1.cs @@ -15,7 +15,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Array1 { private const int Iterations = 125; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Array2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Array2.cs index 9c6ed9e35ee..7124ec43eb8 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Array2.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Array2.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Array2 { public const int Iterations = 500000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/BenchE.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/BenchE.cs index f4eba3eee5f..563117a2e6a 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/BenchE.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/BenchE.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class BenchE { public const int Iterations = 5000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort.cs index 7200336b176..12741b20866 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class BubbleSort { static void SortArray(int[] tab, int last) { diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort2.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort2.cs index 50c24238abc..1e580128281 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort2.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/BubbleSort2.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class BubbleSort2 { public const int Bound = 500 * 15; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/CSieve.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/CSieve.cs index d1dbfbcd471..4746873b09c 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/CSieve.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/CSieve.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class CSieve { public const int Iterations = 200; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs index 5ba78fec9b3..5bae032deb4 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Fib.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Fib { const int Number = 24; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/HeapSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/HeapSort.cs index 7bc6a4413c0..bd07989a6f4 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/HeapSort.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/HeapSort.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class HeapSort { const int ArraySize = 5500; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/IniArray.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/IniArray.cs index aca252360b5..0ed75726806 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/IniArray.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/IniArray.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class IniArray { public const int Iterations = 10000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/LogicArray.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/LogicArray.cs index 9758c0add64..be555f3652e 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/LogicArray.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/LogicArray.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class LogicArray { public const int Iterations = 3000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Midpoint.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Midpoint.cs index f341eaf00bb..f5aa917bd1a 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Midpoint.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Midpoint.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Midpoint { public const int Iterations = 70000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/MulMatrix.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/MulMatrix.cs index 8b377602c7a..eba14400377 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/MulMatrix.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/MulMatrix.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class MulMatrix { public const int Iterations = 100; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/NDhrystone.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/NDhrystone.cs index 1c7e5da5306..5734654f6ad 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/NDhrystone.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/NDhrystone.cs @@ -13,7 +13,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class NDhrystone { public const int Iterations = 7000000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Permutate.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Permutate.cs index dda826f71cb..1b6edcf97b4 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Permutate.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Permutate.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Permutate { public const int Iterations = 20000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs index c141d3d72dd..b9797858aaf 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Pi.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Pi { private int[] a = new int[3340]; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/Puzzle.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/Puzzle.cs index 993eb2a3a7c..ec0c3086ab9 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/Puzzle.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/Puzzle.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class Puzzle { public const int Iterations = 400; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/QuickSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/QuickSort.cs index a35f7dc244e..ffe4f7b246d 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/QuickSort.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/QuickSort.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class QuickSort { const int MAXNUM = 200; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeInsert.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeInsert.cs index d0bcb522f20..22545c5ff42 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeInsert.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeInsert.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class TreeInsert { private struct Node diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeSort.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeSort.cs index 4e8a0296300..2e633c9833b 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeSort.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/TreeSort.cs @@ -8,7 +8,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class TreeSort { const int SortElements = 5000; diff --git a/src/benchmarks/micro/runtime/Benchstones/BenchI/XposMatrix.cs b/src/benchmarks/micro/runtime/Benchstones/BenchI/XposMatrix.cs index 3c9b9313e47..c6e57b607e7 100644 --- a/src/benchmarks/micro/runtime/Benchstones/BenchI/XposMatrix.cs +++ b/src/benchmarks/micro/runtime/Benchstones/BenchI/XposMatrix.cs @@ -9,7 +9,7 @@ namespace Benchstone.BenchI { -[BenchmarkCategory(Categories.CoreCLR, Categories.Benchstones, Categories.BenchI)] +[BenchmarkCategory(Categories.Runtime, Categories.Benchstones, Categories.BenchI)] public class XposMatrix { public const int ArraySize = 100; diff --git a/src/benchmarks/micro/runtime/BilinearInterpol/BilinearInterpol.cs b/src/benchmarks/micro/runtime/BilinearInterpol/BilinearInterpol.cs index b0f253b21ed..d396d2b88a1 100644 --- a/src/benchmarks/micro/runtime/BilinearInterpol/BilinearInterpol.cs +++ b/src/benchmarks/micro/runtime/BilinearInterpol/BilinearInterpol.cs @@ -294,7 +294,7 @@ public static bool CheckResult(double[] output, double[] vectorOutput) } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public double[] Interpol_Scalar() { output = BilinearInterpol(input, A, minXA, maxXA, B, minXB, maxXB, weightB); @@ -302,7 +302,7 @@ public double[] Interpol_Scalar() } [Benchmark] - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public double[] Interpol_Vector() { double[] vectorOutput = BilinearInterpol_Vector(input, A, minXA, maxXA, B, minXB, maxXB, weightB); @@ -310,7 +310,7 @@ public double[] Interpol_Vector() } #if !NETCOREAPP2_1 && !NETCOREAPP2_2 && !NETFRAMEWORK - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] [Benchmark] public double[] Interpol_AVX() { diff --git a/src/benchmarks/micro/runtime/Burgers/Burgers.cs b/src/benchmarks/micro/runtime/Burgers/Burgers.cs index 00f9d211637..aced5863ccc 100644 --- a/src/benchmarks/micro/runtime/Burgers/Burgers.cs +++ b/src/benchmarks/micro/runtime/Burgers/Burgers.cs @@ -14,7 +14,7 @@ using BenchmarkDotNet.Attributes; using MicroBenchmarks; -[BenchmarkCategory(Categories.CoreCLR)] +[BenchmarkCategory(Categories.Runtime)] public class Burgers { private static double BurgersAnalytical(double t, double x, double nu) diff --git a/src/benchmarks/micro/runtime/Bytemark/ByteMark.cs b/src/benchmarks/micro/runtime/Bytemark/ByteMark.cs index 45bc493cdb6..620093667ff 100644 --- a/src/benchmarks/micro/runtime/Bytemark/ByteMark.cs +++ b/src/benchmarks/micro/runtime/Bytemark/ByteMark.cs @@ -250,7 +250,7 @@ public override void ShowStats() } } -[BenchmarkCategory(Categories.CoreCLR)] +[BenchmarkCategory(Categories.Runtime)] public class ByteMark { private static int[] s_randw; diff --git a/src/benchmarks/micro/runtime/Devirtualization/Boxing.cs b/src/benchmarks/micro/runtime/Devirtualization/Boxing.cs index f54def855e0..4f5aad62d6c 100644 --- a/src/benchmarks/micro/runtime/Devirtualization/Boxing.cs +++ b/src/benchmarks/micro/runtime/Devirtualization/Boxing.cs @@ -9,7 +9,7 @@ namespace Devirtualization { - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public class Boxing { [Benchmark] diff --git a/src/benchmarks/micro/runtime/Devirtualization/DefaultEqualityComparerPerf.cs b/src/benchmarks/micro/runtime/Devirtualization/DefaultEqualityComparerPerf.cs index d2c80535236..e83f0d9fbf6 100644 --- a/src/benchmarks/micro/runtime/Devirtualization/DefaultEqualityComparerPerf.cs +++ b/src/benchmarks/micro/runtime/Devirtualization/DefaultEqualityComparerPerf.cs @@ -57,7 +57,7 @@ public bool CompareWrapped(ref T x, ref T y) } } - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public class EqualityComparer { public enum E diff --git a/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassInterface.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassInterface.cs index 8385ef6fab9..fd2a73dcad2 100644 --- a/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassInterface.cs +++ b/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassInterface.cs @@ -13,7 +13,7 @@ namespace GuardedDevirtualization { - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public class ThreeClassInterface { interface I diff --git a/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassVirtual.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassVirtual.cs index e60e842984c..3e2fcebf3e6 100644 --- a/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassVirtual.cs +++ b/src/benchmarks/micro/runtime/Devirtualization/GuardedThreeClassVirtual.cs @@ -13,7 +13,7 @@ namespace GuardedDevirtualization { - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public class ThreeClassVirtual { public class B diff --git a/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassInterface.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassInterface.cs index 76f36343278..b81fb6a41f4 100644 --- a/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassInterface.cs +++ b/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassInterface.cs @@ -13,7 +13,7 @@ namespace GuardedDevirtualization { - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public class TwoClassInterface { interface I diff --git a/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassVirtual.cs b/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassVirtual.cs index 085e3d74f03..d64306a0f68 100644 --- a/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassVirtual.cs +++ b/src/benchmarks/micro/runtime/Devirtualization/GuardedTwoClassVirtual.cs @@ -13,7 +13,7 @@ namespace GuardedDevirtualization { - [BenchmarkCategory(Categories.CoreCLR, Categories.Virtual)] + [BenchmarkCategory(Categories.Runtime, Categories.Virtual)] public class TwoClassVirtual { public class B diff --git a/src/benchmarks/micro/runtime/Exceptions/Handling.cs b/src/benchmarks/micro/runtime/Exceptions/Handling.cs index c092926b484..6034e4ec16f 100644 --- a/src/benchmarks/micro/runtime/Exceptions/Handling.cs +++ b/src/benchmarks/micro/runtime/Exceptions/Handling.cs @@ -7,7 +7,7 @@ namespace Exceptions { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public class Handling { public enum ExceptionKind { Software, Hardware, ReflectionSoftware, ReflectionHardware } diff --git a/src/benchmarks/micro/runtime/FractalPerf/FractalPerf.cs b/src/benchmarks/micro/runtime/FractalPerf/FractalPerf.cs index bd2aad05954..a6a44ce15fd 100644 --- a/src/benchmarks/micro/runtime/FractalPerf/FractalPerf.cs +++ b/src/benchmarks/micro/runtime/FractalPerf/FractalPerf.cs @@ -122,7 +122,7 @@ public override double Render() { } } - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public class Launch { [Benchmark(Description = nameof(FractalPerf))] diff --git a/src/benchmarks/micro/runtime/Inlining/InlineGCStruct.cs b/src/benchmarks/micro/runtime/Inlining/InlineGCStruct.cs index 989a030f0da..839716cddb2 100644 --- a/src/benchmarks/micro/runtime/Inlining/InlineGCStruct.cs +++ b/src/benchmarks/micro/runtime/Inlining/InlineGCStruct.cs @@ -21,7 +21,7 @@ namespace Inlining { -[BenchmarkCategory(Categories.CoreCLR, Categories.Inlining)] +[BenchmarkCategory(Categories.Runtime, Categories.Inlining)] public class InlineGCStruct { [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs b/src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs index 4ec0b975f0b..20bd22363ee 100644 --- a/src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs +++ b/src/benchmarks/micro/runtime/Inlining/NoThrowInline.cs @@ -9,7 +9,7 @@ namespace Inlining { -[BenchmarkCategory(Categories.CoreCLR, Categories.Inlining)] +[BenchmarkCategory(Categories.Runtime, Categories.Inlining)] public class NoThrowInline { static void ThrowIfNull(string s) diff --git a/src/benchmarks/micro/runtime/Layout/SearchLoops.cs b/src/benchmarks/micro/runtime/Layout/SearchLoops.cs index b0179af6a52..a9f2411bea3 100644 --- a/src/benchmarks/micro/runtime/Layout/SearchLoops.cs +++ b/src/benchmarks/micro/runtime/Layout/SearchLoops.cs @@ -12,7 +12,7 @@ namespace Layout { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public unsafe class SearchLoops { public int length = 100; diff --git a/src/benchmarks/micro/runtime/Linq/Linq.cs b/src/benchmarks/micro/runtime/Linq/Linq.cs index 0d10a90eae4..95211127cfd 100644 --- a/src/benchmarks/micro/runtime/Linq/Linq.cs +++ b/src/benchmarks/micro/runtime/Linq/Linq.cs @@ -111,7 +111,7 @@ private static void CreateLists() } } -[BenchmarkCategory(Categories.CoreCLR, Categories.LINQ)] +[BenchmarkCategory(Categories.Runtime, Categories.LINQ)] public class LinqBenchmarks { public const int IterationsWhere00 = 1000000; diff --git a/src/benchmarks/micro/runtime/Lowering/InstructionReplacement.cs b/src/benchmarks/micro/runtime/Lowering/InstructionReplacement.cs index 1afd1f7ce22..37a5ed380ec 100644 --- a/src/benchmarks/micro/runtime/Lowering/InstructionReplacement.cs +++ b/src/benchmarks/micro/runtime/Lowering/InstructionReplacement.cs @@ -7,7 +7,7 @@ namespace Lowering { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public unsafe class InstructionReplacement { [Benchmark(OperationsPerInvoke = 10_000_000)] diff --git a/src/benchmarks/micro/runtime/Math/Functions/Double/AbsDouble.cs b/src/benchmarks/micro/runtime/Math/Functions/Double/AbsDouble.cs index 37bbc116db5..c71c235ce33 100644 --- a/src/benchmarks/micro/runtime/Math/Functions/Double/AbsDouble.cs +++ b/src/benchmarks/micro/runtime/Math/Functions/Double/AbsDouble.cs @@ -8,7 +8,7 @@ namespace System.MathBenchmarks { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public partial class Double { // Tests Math.Abs(double) over 5000 iterations for the domain -1, +1 diff --git a/src/benchmarks/micro/runtime/Math/Functions/MathTests.cs b/src/benchmarks/micro/runtime/Math/Functions/MathTests.cs index 56b3350dbfb..5901b81a765 100644 --- a/src/benchmarks/micro/runtime/Math/Functions/MathTests.cs +++ b/src/benchmarks/micro/runtime/Math/Functions/MathTests.cs @@ -7,7 +7,7 @@ namespace System.MathBenchmarks { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public partial class MathTests { // double has a machine epsilon of approx: 2.22e-16. However, due to floating-point precision diff --git a/src/benchmarks/micro/runtime/Math/Functions/Single/AbsSingle.cs b/src/benchmarks/micro/runtime/Math/Functions/Single/AbsSingle.cs index 1957bda3764..0d1c7a29d84 100644 --- a/src/benchmarks/micro/runtime/Math/Functions/Single/AbsSingle.cs +++ b/src/benchmarks/micro/runtime/Math/Functions/Single/AbsSingle.cs @@ -8,7 +8,7 @@ namespace System.MathBenchmarks { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public partial class Single { // Tests Math.Abs(single) over 5000 iterations for the domain -1, +1 diff --git a/src/benchmarks/micro/runtime/PacketTracer/Render.cs b/src/benchmarks/micro/runtime/PacketTracer/Render.cs index 7a6d31e7c51..9aa07f7e692 100644 --- a/src/benchmarks/micro/runtime/PacketTracer/Render.cs +++ b/src/benchmarks/micro/runtime/PacketTracer/Render.cs @@ -11,7 +11,7 @@ namespace HardwareIntrinsics.RayTracer { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public class SoA { private const int RunningTime = 1000; diff --git a/src/benchmarks/micro/runtime/Roslyn/CscBench.cs b/src/benchmarks/micro/runtime/Roslyn/CscBench.cs index 9f710763231..c419e1f2f62 100644 --- a/src/benchmarks/micro/runtime/Roslyn/CscBench.cs +++ b/src/benchmarks/micro/runtime/Roslyn/CscBench.cs @@ -14,7 +14,7 @@ using BenchmarkDotNet.Attributes; using MicroBenchmarks; -[BenchmarkCategory(Categories.CoreCLR)] +[BenchmarkCategory(Categories.Runtime)] public class CscBench { public const int CompileIterations = 1500; diff --git a/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs index 8fc0622ed90..6c954415356 100644 --- a/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs +++ b/src/benchmarks/micro/runtime/SIMD/ConsoleMandel/ConsoleMandel.cs @@ -9,7 +9,7 @@ namespace SIMD { - [BenchmarkCategory(Categories.CoreCLR, Categories.SIMD)] + [BenchmarkCategory(Categories.Runtime, Categories.SIMD)] public class ConsoleMandel { private static void DoNothing(int x, int y, int count) { } diff --git a/src/benchmarks/micro/runtime/SIMD/RayTracer/RayTracerBench.cs b/src/benchmarks/micro/runtime/SIMD/RayTracer/RayTracerBench.cs index e15d59113e4..a7aa09a52dc 100644 --- a/src/benchmarks/micro/runtime/SIMD/RayTracer/RayTracerBench.cs +++ b/src/benchmarks/micro/runtime/SIMD/RayTracer/RayTracerBench.cs @@ -16,7 +16,7 @@ namespace SIMD { -[BenchmarkCategory(Categories.CoreCLR, Categories.SIMD)] +[BenchmarkCategory(Categories.Runtime, Categories.SIMD)] public class RayTracerBench { private const int Width = 250; diff --git a/src/benchmarks/micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs b/src/benchmarks/micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs index 34a468a8040..e0556d4cc6d 100644 --- a/src/benchmarks/micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs +++ b/src/benchmarks/micro/runtime/SIMD/SeekUnroll/SeekUnroll.cs @@ -9,7 +9,7 @@ using BenchmarkDotNet.Attributes; using MicroBenchmarks; -[BenchmarkCategory(Categories.CoreCLR, Categories.SIMD)] +[BenchmarkCategory(Categories.Runtime, Categories.SIMD)] public class SeekUnroll { // The purpose of this micro-benchmark is to measure the effect of unrolling diff --git a/src/benchmarks/micro/runtime/SciMark/kernel.cs b/src/benchmarks/micro/runtime/SciMark/kernel.cs index 1aba5d03900..767060fe0e9 100644 --- a/src/benchmarks/micro/runtime/SciMark/kernel.cs +++ b/src/benchmarks/micro/runtime/SciMark/kernel.cs @@ -18,7 +18,7 @@ namespace SciMark2 { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] public class kernel { double[] inputFFT; diff --git a/src/benchmarks/micro/runtime/Span/Indexer.cs b/src/benchmarks/micro/runtime/Span/Indexer.cs index 31d1ba6f4bc..2a39e3fd78d 100644 --- a/src/benchmarks/micro/runtime/Span/Indexer.cs +++ b/src/benchmarks/micro/runtime/Span/Indexer.cs @@ -20,7 +20,7 @@ public class Sink public int i; } - [BenchmarkCategory(Categories.CoreCLR, Categories.Span)] + [BenchmarkCategory(Categories.Runtime, Categories.Span)] public class IndexerBench { [Params(1024)] diff --git a/src/benchmarks/micro/runtime/Span/Sorting.cs b/src/benchmarks/micro/runtime/Span/Sorting.cs index 7fe35e53761..33a636546f4 100644 --- a/src/benchmarks/micro/runtime/Span/Sorting.cs +++ b/src/benchmarks/micro/runtime/Span/Sorting.cs @@ -11,7 +11,7 @@ namespace Span { - [BenchmarkCategory(Categories.CoreCLR)] + [BenchmarkCategory(Categories.Runtime)] [InvocationCount(InvocationsPerIteration)] public class Sorting { diff --git a/src/benchmarks/micro/runtime/System.Reflection/Activator.cs b/src/benchmarks/micro/runtime/System.Reflection/Activator.cs index 4c56b74bacf..fda5c69709c 100644 --- a/src/benchmarks/micro/runtime/System.Reflection/Activator.cs +++ b/src/benchmarks/micro/runtime/System.Reflection/Activator.cs @@ -7,7 +7,7 @@ namespace System.Reflection { - [BenchmarkCategory(Categories.CoreCLR, Categories.Reflection)] + [BenchmarkCategory(Categories.Runtime, Categories.Reflection)] [GenericTypeArguments(typeof(EmptyStruct))] // value type [GenericTypeArguments(typeof(EmptyClass))] // reference type public class Activator diff --git a/src/benchmarks/micro/runtime/System.Reflection/Attributes.cs b/src/benchmarks/micro/runtime/System.Reflection/Attributes.cs index 483b71340bd..132a37fdc87 100644 --- a/src/benchmarks/micro/runtime/System.Reflection/Attributes.cs +++ b/src/benchmarks/micro/runtime/System.Reflection/Attributes.cs @@ -7,7 +7,7 @@ namespace System.Reflection { - [BenchmarkCategory(Categories.CoreCLR, Categories.Reflection)] + [BenchmarkCategory(Categories.Runtime, Categories.Reflection)] public class Attributes { private static readonly MethodInfo AttributedOverride = typeof(AttributedClass).GetMethod(nameof(AttributedClass.FooAttributed)); diff --git a/src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs b/src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs index 8d2f5141f2f..cab673617c8 100644 --- a/src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs +++ b/src/benchmarks/micro/runtime/V8/Crypto/Crypto.cs @@ -46,7 +46,7 @@ namespace V8.Crypto { - [BenchmarkCategory(Categories.CoreCLR, Categories.V8)] + [BenchmarkCategory(Categories.Runtime, Categories.V8)] public class Support { private const string INPUT = "The quick brown fox jumped over the extremely lazy frogs!"; diff --git a/src/benchmarks/micro/runtime/V8/Richards/Richards.cs b/src/benchmarks/micro/runtime/V8/Richards/Richards.cs index 9f71428b06d..5275133af54 100644 --- a/src/benchmarks/micro/runtime/V8/Richards/Richards.cs +++ b/src/benchmarks/micro/runtime/V8/Richards/Richards.cs @@ -23,7 +23,7 @@ namespace V8.Richards /// Support is used for a place to generate any 'miscellaneous' methods generated as part /// of code generation, (which do not have user-visible names) /// - [BenchmarkCategory(Categories.CoreCLR, Categories.V8)] + [BenchmarkCategory(Categories.Runtime, Categories.V8)] public class Support { public static bool runRichards() diff --git a/src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs b/src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs index 2fc78c0b8ad..5e070d96f88 100644 --- a/src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs +++ b/src/benchmarks/micro/runtime/perflab/BlockCopyPerf.cs @@ -7,7 +7,7 @@ namespace PerfLabTests { - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class BlockCopyPerf { private byte[] bytes; diff --git a/src/benchmarks/micro/runtime/perflab/CastingPerf.cs b/src/benchmarks/micro/runtime/perflab/CastingPerf.cs index 96d1ca88a09..f42b8906be4 100644 --- a/src/benchmarks/micro/runtime/perflab/CastingPerf.cs +++ b/src/benchmarks/micro/runtime/perflab/CastingPerf.cs @@ -87,7 +87,7 @@ public class MyClass1 : IMyInterface1 { } public class MyClass2 : IMyInterface2 { } public class MyClass4 : IMyInterface1 { } - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class CastingPerf { public const int NUM_ARRAY_ELEMENTS = 100; diff --git a/src/benchmarks/micro/runtime/perflab/CastingPerf2.cs b/src/benchmarks/micro/runtime/perflab/CastingPerf2.cs index fda38ec51f6..99ad44d881a 100644 --- a/src/benchmarks/micro/runtime/perflab/CastingPerf2.cs +++ b/src/benchmarks/micro/runtime/perflab/CastingPerf2.cs @@ -81,7 +81,7 @@ public struct FooORVT public Foo m_f; } - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class CastingPerf { public static int InnerIterationCount200000 = 200000; // do not change the value and keep it public static NOT-readonly, ported "as is" from CoreCLR repo diff --git a/src/benchmarks/micro/runtime/perflab/DelegatePerf.cs b/src/benchmarks/micro/runtime/perflab/DelegatePerf.cs index e2c1b1d18b4..b8fc9152d5e 100644 --- a/src/benchmarks/micro/runtime/perflab/DelegatePerf.cs +++ b/src/benchmarks/micro/runtime/perflab/DelegatePerf.cs @@ -10,7 +10,7 @@ namespace PerfLabTests public delegate long DelegateLong(Object obj, long x, long y); public delegate void MultiDelegate(Object obj, long x, long y); - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class DelegatePerf { public static int InnerIterationCount200000 = 200000; // do not change the value and keep it public static NOT-readonly, ported "as is" from CoreCLR repo diff --git a/src/benchmarks/micro/runtime/perflab/DictionaryExpansion.cs b/src/benchmarks/micro/runtime/perflab/DictionaryExpansion.cs index 11455f50b96..3a0080ed50b 100644 --- a/src/benchmarks/micro/runtime/perflab/DictionaryExpansion.cs +++ b/src/benchmarks/micro/runtime/perflab/DictionaryExpansion.cs @@ -76,7 +76,7 @@ public static void FuncOnGenClassTest() } } - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class DictionaryExpansion { [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/benchmarks/micro/runtime/perflab/EnumPerf.cs b/src/benchmarks/micro/runtime/perflab/EnumPerf.cs index b01ff438f88..dbbd14c5d85 100644 --- a/src/benchmarks/micro/runtime/perflab/EnumPerf.cs +++ b/src/benchmarks/micro/runtime/perflab/EnumPerf.cs @@ -18,7 +18,7 @@ public enum Color Orange } - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class EnumPerf { public object blackObject = Color.Black; diff --git a/src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs b/src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs index 2cb2ba70dc3..ad8563cbb49 100644 --- a/src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs +++ b/src/benchmarks/micro/runtime/perflab/LowLevelPerf.cs @@ -10,7 +10,7 @@ namespace PerfLabTests { - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class LowLevelPerf { public static int InnerIterationCount = 100000; // do not change the value and keep it public static NOT-readonly, ported "as is" from CoreCLR repo diff --git a/src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs b/src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs index 6feabbec7f7..0057f20901b 100644 --- a/src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs +++ b/src/benchmarks/micro/runtime/perflab/ReflectionPerf.cs @@ -9,7 +9,7 @@ namespace PerfLabTests { - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab, Categories.Reflection)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab, Categories.Reflection)] public class GetMember { public static int InnerIterationCount = 1000; // do not change the value and keep it public static NOT-readonly, ported "as is" from CoreCLR repo diff --git a/src/benchmarks/micro/runtime/perflab/StackWalk.cs b/src/benchmarks/micro/runtime/perflab/StackWalk.cs index 8832d52cd45..cb652d5eaeb 100644 --- a/src/benchmarks/micro/runtime/perflab/StackWalk.cs +++ b/src/benchmarks/micro/runtime/perflab/StackWalk.cs @@ -8,7 +8,7 @@ namespace PerfLabTests { - [BenchmarkCategory(Categories.CoreCLR, Categories.Perflab)] + [BenchmarkCategory(Categories.Runtime, Categories.Perflab)] public class StackWalk { public static int InnerIterationCount = 1000; // do not change the value and keep it public static NOT-readonly, ported "as is" from CoreCLR repo From bd5eebc6bf8b0e5984cecd328fb2b0feb83ca20b Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:42:52 +0100 Subject: [PATCH 04/16] update prerequisites docs --- docs/prerequisites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/prerequisites.md b/docs/prerequisites.md index 1c95418f22d..929219e9840 100644 --- a/docs/prerequisites.md +++ b/docs/prerequisites.md @@ -2,7 +2,7 @@ ## Clone -This repository is **independent of CoreFX and CoreCLR repositories!** So this is the only repository you need to clone. +This repository is **independent of [dotnet/runtime](https://github.com/dotnet/runtime) repository!** So this is the only repository you need to clone. ```cmd git clone https://github.com/dotnet/performance.git From 75633cd29b308dea716e6c63f9aafbe80600cf52 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:43:42 +0100 Subject: [PATCH 05/16] update benchmarkdotnet docs --- docs/benchmarkdotnet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/benchmarkdotnet.md b/docs/benchmarkdotnet.md index 78624c087c3..da55ab2de6c 100644 --- a/docs/benchmarkdotnet.md +++ b/docs/benchmarkdotnet.md @@ -324,7 +324,7 @@ Please use this option only when you are sure that the benchmarks you want to ru ### CoreRun -It's possible to benchmark private builds of CoreCLR/FX using CoreRun. +It's possible to benchmark private builds of dotnet runtime using CoreRun. ```cmd dotnet run -c Release -f netcoreapp3.0 --coreRun $thePath From 64d62caee5ecab8ada616938d40a2eeaa91a98a3 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:47:34 +0100 Subject: [PATCH 06/16] update the microbenchmark design guidelines docs --- docs/microbenchmark-design-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/microbenchmark-design-guidelines.md b/docs/microbenchmark-design-guidelines.md index 112b80ca7a6..e7b547595e1 100644 --- a/docs/microbenchmark-design-guidelines.md +++ b/docs/microbenchmark-design-guidelines.md @@ -282,7 +282,7 @@ Does it make sense to test the code paths that throw? Should we test the code path for an array with one or zero elements? * No, because it does not perform any actual work. We would be benchmarking a branch and return from the method. If `Reverse` is inlinable, such a benchmark would be measuring the performance of `if (length <= 1)` and the throw checks. -* No, because it's not a common case. Moreover, it's very unlikely that removing this check from the code would pass the CoreFX/CLR Code Review and regress the performance in the future. +* No, because it's not a common case. Moreover, it's very unlikely that removing this check from the code would pass the dotnet runtime repository code review and regress the performance in the future. So what is left? A loop that does the actual work. Does it make sense to test it for arrays of different sizes? From 681e36fdea666b183ca07671343179e99ebfe776 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 13:56:05 +0100 Subject: [PATCH 07/16] update the Microbenchmarks readme page docs --- src/benchmarks/micro/README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/benchmarks/micro/README.md b/src/benchmarks/micro/README.md index bc2cc38f6a5..995df464103 100644 --- a/src/benchmarks/micro/README.md +++ b/src/benchmarks/micro/README.md @@ -48,10 +48,11 @@ dotnet run -c Release -f netcoreapp2.1 --filter * --runtimes netcoreapp2.1 netco ## Private Runtime Builds -If you contribute to CoreFX/CoreCLR and want to benchmark **local builds of .NET Core** you need to build CoreFX/CoreCLR in Release (including tests) and then provide the path(s) to CoreRun(s). Provided CoreRun(s) will be used to execute every benchmark in a dedicated process: +If you contribute to [dotnet/runtime](https://github.com/dotnet/runtime) and want to benchmark **local builds of .NET Core** you need to build dotnet runtime in Release (including tests) and then provide the path(s) to CoreRun(s). Provided CoreRun(s) will be used to execute every benchmark in a dedicated process: ```cmd -dotnet run -c Release -f netcoreapp3.0 --filter $YourFilter --coreRun "C:\Projects\coreclr\bin\tests\Windows_NT.x64.Release\Tests\Core_Root\CoreRun.exe" +dotnet run -c Release -f netcoreapp3.0 --filter $YourFilter \ + --corerun C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe ``` To make sure that your changes don't introduce any regressions, you can provide paths to CoreRuns with and without your changes and use the Statistical Test feature to detect regressions/improvements ([read more](../../../docs/benchmarkdotnet.md#Regressions)): @@ -61,8 +62,8 @@ dotnet run -c Release -f netcoreapp3.0 \ --filter BenchmarksGame* \ --statisticalTest 3ms \ --coreRun \ - "C:\Projects\corefx_upstream\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" \ - "C:\Projects\corefx_fork\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" + "C:\Projects\runtime_upstream\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe" \ + "C:\Projects\runtime_fork\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe" ``` If you **prefer to use dotnet cli** instead of CoreRun, you need to pass the path to cli via the `--cli` argument. @@ -75,16 +76,16 @@ We once again encourage you to read the [full docs about BenchmarkDotNet](../../ ### Categories -Every micro benchmark should belong to either CoreCLR, CoreFX or ThirdParty category. It allows for proper filtering for CI runs: +Every micro benchmark should belong to either Runtime, Libraries or ThirdParty category. It allows for proper filtering for CI runs: -* CoreCLR - benchmarks belonging to this category are executed for CoreCLR CI jobs -* CoreFX - benchmarks belonging to this category are executed for CoreFX CI jobs +* Runtime - benchmarks belonging to this category are executed for Runtime CI jobs +* Libraries - benchmarks belonging to this category are executed for Libraries CI jobs * ThirdParty - benchmarks belonging to this category are not going to be executed as part of our daily CI runs. We are going to run them periodically to make sure we don't regress any of the most popular 3rd party libraries. Adding given type/method to particular category requires using a `[BenchmarkCategory]` attribute: ```cs -[BenchmarkCategory(Categories.CoreFX)] +[BenchmarkCategory(Categories.Libraries)] public class SomeType ``` @@ -93,6 +94,6 @@ public class SomeType This is possible with the `AllowedOperatingSystemsAttribute`. You need to provide a mandatory comment and OS(es) that benchmark(s) can run on. ```cs -[AllowedOperatingSystems("Hangs on non-Windows, dotnet/corefx#18290", OS.Windows)] +[AllowedOperatingSystems("Hangs on non-Windows, dotnet/runtime#18290", OS.Windows)] public class Perf_PipeTest ``` From 67661ab5dad40435a43a80d320d48bce75f2e92b Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 14:37:01 +0100 Subject: [PATCH 08/16] update profiling workflow docs --- ...d => profiling-workflow-dotnet-runtime.md} | 56 ++++++++----------- 1 file changed, 22 insertions(+), 34 deletions(-) rename docs/{profiling-workflow-corefx.md => profiling-workflow-dotnet-runtime.md} (90%) diff --git a/docs/profiling-workflow-corefx.md b/docs/profiling-workflow-dotnet-runtime.md similarity index 90% rename from docs/profiling-workflow-corefx.md rename to docs/profiling-workflow-dotnet-runtime.md index 0e220bf5d41..47efecd69bf 100644 --- a/docs/profiling-workflow-corefx.md +++ b/docs/profiling-workflow-dotnet-runtime.md @@ -1,4 +1,4 @@ -# Profiling workflow for CoreFX +# Profiling workflow for dotnet runtime repository ## Table of Contents @@ -34,9 +34,9 @@ # Introduction -**This doc explains how to profile local CoreFX and CoreCLR builds and it's targetted at CoreFX and CoreCLR contributors.** +**This doc explains how to profile local dotnet runtime builds and it's targetted at dotnet runtime repository contributors.** -Before you start any performance investigation, you need to [build](#Build) CoreFX and|or CoreCLR in **Release**, create a small [repro](#Repro) app and change the default [project settings](#Project-Settings). +Before you start any performance investigation, you need to [build](#Build) dotnet runtime in **Release**, create a small [repro](#Repro) app and change the default [project settings](#Project-Settings). The next step is to choose the right profiler depending on the OS: @@ -45,7 +45,7 @@ The next step is to choose the right profiler depending on the OS: * [PerfView](#PerfView) is the ultimate .NET Profiler but it has a high entry cost. If Visual Studio Profiler is not enough, you should switch to [PerfView](#PerfView). * Linux * [dotnet trace](https://github.com/dotnet/diagnostics/blob/master/documentation/dotnet-trace-instructions.md) works on every OS, it's easy to use and it should be your **default choice** on Unix systems. - * [PerfCollect](#PerfCollect) is a simple, yet very powerful script that allows for profiling native parts of CoreFX/CLR. You should use it if `dotnet trace` can not handle your case. + * [PerfCollect](#PerfCollect) is a simple, yet very powerful script that allows for profiling native parts of dotnet runtime. You should use it if `dotnet trace` can not handle your case. If you clearly need information on CPU instruction level, then depending on the hardware you should use [Intel VTune](#VTune) or [AMD uProf](https://developer.amd.com/amd-uprof/). @@ -53,42 +53,30 @@ If you clearly need information on CPU instruction level, then depending on the ## Build -If you are interested in profiling some parts of `System.Private.CoreLib.dll` and **being able to see the source code in Visual Studio Profiler**, you need to build CoreCLR in Release first: +You need to build dotnet runtime in Release first: ```cmd -C:\Projects\coreclr> build -release -``` - -The next step is to build CoreFX in Release and provide the path to CoreCLR via [CoreCLROverridePath](https://github.com/dotnet/corefx/blob/0e7236fda21a07302b14030c82f79bb981c723a6/Documentation/project-docs/developer-guide.md#testing-with-private-coreclr-bits) build parameter: - -```cmd -C:\Projects\corefx> build -c Release /p:CoreCLROverridePath="C:\Projects\coreclr\bin\Product\Windows_NT.x64.Release" -``` - -If you don't care about detailed `System.Private.CoreLib.dll` info you can just build the CoreFX itself: - -```cmd -C:\Projects\corefx> build -c Release +C:\Projects\runtime> build -c Release ``` The build produces two things that we care about: -* `dotnet` and all `System.XYZ.dlls` used internally by CoreFX to run unit tests. It can be used by Visual Studio Profiler to run the code that you want to profile. Example: +* `dotnet` and all `System.XYZ.dlls` used internally to run Libraries unit tests. It can be used by Visual Studio Profiler to run the code that you want to profile. Example: ```log -C:\Projects\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Release-x64\dotnet.exe +C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\dotnet.exe ``` * `CoreRun` and all `System.XYZ.dlls` that can be used to run the code that you want to profile. Example: ```log -C:\Projects\corefx\artifacts\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe +C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe ``` -Once you rebuild the part of CoreFX you are working on, the appropriate `.dll` gets updated and the next time you run profiler, dotnet|CoreRun is going to use the updated library. +Once you rebuild the part of dotnet runtime you are working on, the appropriate `.dll` gets updated and the next time you run profiler, dotnet|CoreRun is going to use the updated library. ```cmd -C:\Projects\corefx\src\System.Text.RegularExpressions\src> dotnet msbuild /p:ConfigurationGroup=Release +C:\Projects\runtime\src\libraries\System.Text.RegularExpressions\src> dotnet msbuild /p:ConfigurationGroup=Release ``` ## Repro @@ -143,7 +131,7 @@ It's recommended to disable Tiered JIT (to avoid the need of warmup) and emit fu Exe - netcoreapp3.0 + netcoreapp5.0 pdbonly true @@ -159,7 +147,7 @@ It's recommended to disable Tiered JIT (to avoid the need of warmup) and emit fu Visual Studio Profiler is not as powerful as PerfView, but it's definitely more intuitive to use. If you don't know which profiler to use, you should use it by default. -To profile a local build of CoreFX and get symbol solving working in Visual Studio Profiler you can use the produced `dotnet` or `CoreRun`. +To profile a local build of dotnet runtime and get symbol solving working in Visual Studio Profiler you can use the produced `dotnet` or `CoreRun`. ## dotnet @@ -184,10 +172,10 @@ SET sln=%2 start %sln% ``` -You can just save it as `startvs.cmd` file and run providing path to the `testhost` folder produced by CoreFX build and a VS solution with repo project: +You can just save it as `startvs.cmd` file and run providing path to the `testhost` folder produced by dotnet runtime build and a VS solution with repo project: ```cmd -startvs.cmd "C:\Projects\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Release-x64\" "C:\Projects\repro\ProfilingDocs.sln" +startvs.cmd "C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\" "C:\Projects\repro\ProfilingDocs.sln" ``` ## CPU Usage @@ -204,7 +192,7 @@ Give VS a few seconds to run. It's important to execute enough code to run for a ![Few seconds](img/vs_profiler_2_few_seconds.png) -By default VS Profiler does not show the [External Code](https://docs.microsoft.com/en-us/visualstudio/profiling/beginners-guide-to-performance-profiling?view=vs-2019#view-external-code) (functions in system and framework component). When you are profiling CoreFX or CoreCLR this is **the most important thing you care about**. To show the external code click `Filter` then check `Show External Code` and click `Apply` button. +By default VS Profiler does not show the [External Code](https://docs.microsoft.com/en-us/visualstudio/profiling/beginners-guide-to-performance-profiling?view=vs-2019#view-external-code) (functions in system and framework component). When you are profiling dotnet runtime this is **the most important thing you care about**. To show the external code click `Filter` then check `Show External Code` and click `Apply` button. ![Show External code](img/vs_profiler_3_external_code.png) @@ -305,7 +293,7 @@ We can **Collect** profile data by either **Run**ning a standalone executable (o ![Collect Menu Items](img/perfview_1_collect.png) -When profiling local CoreFX build it's recommended to **Run** a standalone repro app using CoreRun. +When profiling local dotnet runtime build it's recommended to **Run** a standalone repro app using CoreRun. ![Run CoreRun](img/perfview_2_run_corerun.png) @@ -409,7 +397,7 @@ If you want to view the Source Code of the given method you need to right-click If PerfView fails to show you the source code you should read the `Log` output. If you are unable to make it work and you really care about it you should switch to Visual Studio Profiler. -**Note:** As of today, PerfView keeps the `.pdb` files [opened](https://github.com/microsoft/perfview/pull/979) after showing the source code. It means that if you keep the trace file opened in PerfView and try to rebuild CoreFX/CLR the build is going to fail. You might need to close PerfView to rebuild CoreFX/CLR. +**Note:** As of today, PerfView keeps the `.pdb` files [opened](https://github.com/microsoft/perfview/pull/979) after showing the source code. It means that if you keep the trace file opened in PerfView and try to rebuild dotnet runtime the build is going to fail. You might need to close PerfView to rebuild dotnet runtime. ## Identifying Regressions @@ -564,7 +552,7 @@ VTune is capable of showing not only the output assembly code but also native an If it ever fails to show the source code (the `Source` button is then greyed out), you can click on the `Search Sources/Binaries` button and specify additional folders that should be searched for symbol and source files. -**Note:** According to the VTune [docs](https://software.intel.com/en-us/vtune-amplifier-help-dialog-box-source-search), the search is non-recursive. So adding just `corefx` and `coreclr` repo root folders to the list is not enough. +**Note:** According to the VTune [docs](https://software.intel.com/en-us/vtune-amplifier-help-dialog-box-source-search), the search is non-recursive. So adding just dotnet runtime repo root folder to the list is not enough. ![Specify Sources](img/vtune_folders.png) @@ -608,9 +596,9 @@ It can show the disassembly of profiled methods: PerfCollect is a simple, yet very powerful script that allows for profiling .NET Core apps on Linux. It is internally leveraging LTTng and using perf. -In contrary to `dotnet trace` it gives you native call stacks which are very useful when you need to profile native parts of CoreFX/CLR. +In contrary to `dotnet trace` it gives you native call stacks which are very useful when you need to profile native parts of dotnet runtime. -It has it's own excellent [documentation](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/linux-performance-tracing.md) (a **highly recommended read**), the goal of this doc is not to duplicate it, but rather show **how to profile local CoreFX/CLR build running on a Linux VM from a Windows developer machine**. We need two OSes because as of today only PerfView is capable of opening a `PerfCollect` trace file. +It has it's own excellent [documentation](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/linux-performance-tracing.md) (a **highly recommended read**), the goal of this doc is not to duplicate it, but rather show **how to profile local dotnet runtime build running on a Linux VM from a Windows developer machine**. We need two OSes because as of today only PerfView is capable of opening a `PerfCollect` trace file. ## Preparing Your Machine @@ -665,7 +653,7 @@ To collect a trace, you need to open two terminals: * one for controlling tracing, referred to as [Trace] * one for running the application, referred to as [App]. -**[App]**: Setup the application shell - this enables tracing configuration inside of CoreCLR: +**[App]**: Setup the application shell - this enables tracing configuration inside of .NET Core: ```cmd export COMPlus_PerfMapEnabled=1 From f0bcd8abd17b6be9c9d7f6a1ef45fb1ef3265830 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 14:50:27 +0100 Subject: [PATCH 09/16] update benchmarking workflow docs --- ...> benchmarking-workflow-dotnet-runtime.md} | 135 +++++++++--------- 1 file changed, 66 insertions(+), 69 deletions(-) rename docs/{benchmarking-workflow-corefx.md => benchmarking-workflow-dotnet-runtime.md} (60%) diff --git a/docs/benchmarking-workflow-corefx.md b/docs/benchmarking-workflow-dotnet-runtime.md similarity index 60% rename from docs/benchmarking-workflow-corefx.md rename to docs/benchmarking-workflow-dotnet-runtime.md index 5770d3d8c24..1757c84bc85 100644 --- a/docs/benchmarking-workflow-corefx.md +++ b/docs/benchmarking-workflow-dotnet-runtime.md @@ -1,23 +1,22 @@ -# Benchmarking workflow for CoreFX +# Benchmarking workflow for dotnet runtime repository ## Table of Contents - [Introduction](#Introduction) - [Code Organization](#Code-Organization) - - [CoreFX Prerequisites](#CoreFX-Prerequisites) + - [dotnet runtime Prerequisites](#dotnet-runtime-Prerequisites) - [Preventing Regressions](#Preventing-Regressions) - [Solving Regressions](#Solving-Regressions) - [Repro Case](#Repro-Case) - [Profiling](#Profiling) - [Running against Older Versions](#Running-against-Older-Versions) -- [Local CoreCLR Build](#Local-CoreCLR-Build) - [Benchmarking new API](#Benchmarking-new-API) - [Reference](#Reference) - [PR](#PR) ## Introduction -This repository is **independent of the CoreFX build system.** All you need to get the benchmarks running is to download the dotnet cli or use the python script. Please see [Prerequisites](./prerequisites.md) for more. +This repository is **independent of the [dotnet/runtime](https://github.com/dotnet/runtime) build system.** All you need to get the benchmarks running is to download the dotnet SDKs and cli or use the python script which can do it for you. Please see [Prerequisites](./prerequisites.md) for more. If you are not familiar with BenchmarkDotNet or this repository you should read the [Microbenchmarks Guide](../src/benchmarks/micro/README.md) first. It's really short and concise, we really encourage you to read it. @@ -25,11 +24,11 @@ To learn more about designing benchmarks, please read [Microbenchmark Design Gui ### Code Organization -All CoreFX benchmarks which have been ported from CoreFX repository belong to the corresponding folders: `corefx\$namespace`. The directory structure is the following (some folders have been omitted for brevity): +All Libraries benchmarks which have been ported from the old CoreFX repository belong to the corresponding folders: `libraries\$namespace`. The Runtime (old CoreCLR) benchmarks can be found in `runtime` subfolder. The directory structure is the following (some folders have been omitted for brevity): ```log PS C:\Projects\performance\src\benchmarks\micro> tree -├───corefx +├───libraries │ ├───System │ ├───System.Collections │ ├───System.ComponentModel.TypeConverter @@ -61,6 +60,34 @@ PS C:\Projects\performance\src\benchmarks\micro> tree │ ├───System.Threading.ThreadPool │ ├───System.Threading.Timers │ └───System.Xml.XmlDocument +├───runtime +│ ├───BenchmarksGame +│ │ └───Inputs +│ ├───Benchstones +│ │ ├───BenchF +│ │ └───BenchI +│ ├───BilinearInterpol +│ ├───Burgers +│ ├───Bytemark +│ ├───Devirtualization +│ ├───Exceptions +│ ├───FractalPerf +│ ├───Inlining +│ ├───Layout +│ ├───Linq +│ ├───Lowering +│ ├───Math +│ │ └───Functions +│ │ ├───Double +│ │ └───Single +│ ├───PacketTracer +│ ├───perflab +│ ├───Roslyn +│ ├───SciMark +│ ├───SIMD +│ ├───Span +│ ├───System.Reflection +│ └───V8 ``` During the port from xunit-performance to BenchmarkDotNet, the namespaces, type and methods names were not changed. The exception to this rule are all `System.Collections` ([#92](https://github.com/dotnet/performance/pull/92)) and `Span` ([#94](https://github.com/dotnet/performance/pull/94)) benchmarks which got rewritten to utilize the full capabilities of BenchmarkDotNet. @@ -68,33 +95,34 @@ During the port from xunit-performance to BenchmarkDotNet, the namespaces, type Please remember that you can filter the benchmarks using a glob pattern applied to namespace.typeName.methodName ([read more](./benchmarkdotnet.md#Filtering-the-Benchmarks)): ```cmd -dotnet run -c Release -f netcoreapp3.0 --filter System.Memory* +dotnet run -c Release -f netcoreapp5.0 --filter System.Memory* ``` -Moreover, every CoreFX benchmark belongs to a [CoreFX category](../src/benchmarks/micro/README.md#Categories) +Moreover, every Libaries (new name for CoreFX) benchmark belongs to a [Libraries category](../src/benchmarks/micro/README.md#Categories). Same goes for Runtime (old name was CoreCLR). -### CoreFX Prerequisites +### dotnet runtime Prerequisites -In order to run the benchmarks against local CoreFX build you need to build the CoreFX repository in **Release**: +In order to run the benchmarks against local dotnet runtime build you need to build the dotnet/runtime repository in **Release**: ```cmd -C:\Projects\corefx> build -c Release +C:\Projects\runtime> build -c Release ``` -**The most important build artifact for us is CoreRun**. CoreRun is a simple host that does NOT take any dependency on NuGet. BenchmarkDotNet generates some boilerplate code, builds it using dotnet cli and tells CoreRun.exe to run the benchmarks from the auto-generated library. CoreRun runs the benchmarks using the libraries that are placed in its folder. When a benchmarked code has a dependency to `System.ABC.dll` version 4.5 and CoreRun has `System.ABC.dll` version 4.5.1 in its folder, then CoreRun is going to load and use `System.ABC.dll` version 4.5.1. **This means that with a single clone of this dotnet/performance repository you can run benchmarks against private builds of CoreCLR/FX from many different locations.** +**The most important build artifact for us is CoreRun**. CoreRun is a simple host that does NOT take any dependency on NuGet. BenchmarkDotNet generates some boilerplate code, builds it using dotnet cli and tells CoreRun.exe to run the benchmarks from the auto-generated library. CoreRun runs the benchmarks using the libraries that are placed in its folder. When a benchmarked code has a dependency to `System.ABC.dll` version 4.5 and CoreRun has `System.ABC.dll` version 4.5.1 in its folder, then CoreRun is going to load and use `System.ABC.dll` version 4.5.1. **This means that with a single clone of this dotnet/performance repository you can run benchmarks against private builds of dotnet runtime from many different locations.** -Every time you want to run the benchmarks against local build of CoreFX you need to provide the path to CoreRun: +Every time you want to run the benchmarks against local build of dotnet runtime you need to provide the path to CoreRun: ```cmd -dotnet run -c Release -f netcoreapp3.0 --coreRun "C:\Projects\corefx\artifacts\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" --filter $someFilter +dotnet run -c Release -f netcoreapp5.0 --filter $someFilter \ + --coreRun C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe ``` **Note:** BenchmarkDotNet expects a path to `CoreRun.exe` file (`corerun` on Unix), not to `Core_Root` folder. -Once you rebuild the part of CoreFX you are working on, the appropriate `.dll` gets updated and the next time you run the benchmarks, CoreRun is going to load the updated library. +Once you rebuild the part of dotnet runtime you are working on, the appropriate `.dll` gets updated and the next time you run the benchmarks, CoreRun is going to load the updated library. ```cmd -C:\Projects\corefx\src\System.Text.RegularExpressions\src> dotnet msbuild /p:ConfigurationGroup=Release +C:\Projects\runtime\src\libraries\System.Text.RegularExpressions\src> dotnet msbuild /p:ConfigurationGroup=Release ``` ## Preventing Regressions @@ -104,10 +132,9 @@ Preventing regressions is a fundamental part of our performance culture. The che **Before introducing any changes that may impact performance**, you should run the benchmarks that test the performance of the feature that you are going to work on and store the results in a **dedicated** folder. ```cmd -C:\Projects\performance\src\benchmarks\micro> dotnet run -c Release \ - -f netcoreapp3.0 \ +C:\Projects\performance\src\benchmarks\micro> dotnet run -c Release -f netcoreapp5.0 \ --artifacts "C:\results\before" \ - --coreRun "C:\Projects\corefx\artifacts\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" \ + --coreRun "C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe" \ --filter System.IO.Pipes* ``` @@ -115,15 +142,14 @@ Please try to **avoid running any resource-heavy processes** that could **spoil* You can also create a **copy** of the folder with CoreRun and all the libraries to be able to run the benchmarks against the **unmodified base** in the future. -After you introduce the changes and rebuild the part of CoreFX that you are working on **in Release** you should re-run the benchmarks. Remember to store the results in a different folder. +After you introduce the changes and rebuild the part of dotnet runtime that you are working on **in Release** you should re-run the benchmarks. Remember to store the results in a different folder. ```cmd -C:\Projects\corefx\src\System.IO.Pipes\src> dotnet msbuild /p:ConfigurationGroup=Release +C:\Projects\runtime\src\libraries\System.IO.Pipes\src> dotnet msbuild /p:ConfigurationGroup=Release -C:\Projects\performance\src\benchmarks\micro> dotnet run -c Release \ - -f netcoreapp3.0 \ +C:\Projects\performance\src\benchmarks\micro> dotnet run -c Release -f netcoreapp5.0 \ --artifacts "C:\results\after" \ - --coreRun "C:\Projects\corefx\artifacts\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" \ + --coreRun "C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe" \ --filter System.IO.Pipes* ``` @@ -148,7 +174,7 @@ No Slower results for the provided threshold = 2% and noise filter = 0.3ns. To run the benchmarks against the latest .NET Core SDK you can use the [benchmarks_ci.py](../scripts/benchmarks_ci.py) script. It's going to download the latest .NET Core SDK(s) for the provided framework(s) and run the benchmarks for you. Please see [Prerequisites](./prerequisites.md#python) for more. ```cmd -C:\Projects\performance> py scripts\benchmarks_ci.py -f netcoreapp3.0 \ +C:\Projects\performance> py scripts\benchmarks_ci.py -f netcoreapp5.0 \ --bdn-arguments="--artifacts "C:\results\latest_sdk"" \ --filter System.IO.Pipes* ``` @@ -159,14 +185,17 @@ C:\Projects\performance> py scripts\benchmarks_ci.py -f netcoreapp3.0 \ Once a regression is spotted, the first thing that you need to do is to create a benchmark that shows the problem. Typically every performance bug report comes with a small repro case. This is a perfect candidate for the benchmark (it might require some cleanup). -The next step is to send a PR to this repository with the aforementioned benchmark. Our automation is going to run this benchmark and export the results to our reporting system. When your fix to CoreFX gets merged, our reports are going to show the difference. It also helps us to keep track of the old performance bugs and make sure that they never come back. +The next step is to send a PR to this repository with the aforementioned benchmark. Our automation is going to run this benchmark and export the results to our reporting system. When your fix to dotnet/runtime gets merged, our reports are going to show the difference. It also helps us to keep track of the old performance bugs and make sure that they never come back. ### Profiling -The real performance investigation starts with profiling. To profile the benchmarked code and produce an ETW Trace file ([read more](./benchmarkdotnet.md#Profiling)): +The real performance investigation starts with profiling. We have a comprehensive guide about profiling dotnet runtime, we really encourage you to read it: [Profiling dotnet runtime workflow](./profiling-workflow-dotnet-runtime.md). + + +To profile the benchmarked code and produce an ETW Trace file ([read more](./benchmarkdotnet.md#Profiling)): ```cmd -dotnet run -c Release -f netcoreapp3.0 --profiler ETW --filter $YourFilter +dotnet run -c Release -f netcoreapp5.0 --profiler ETW --filter $YourFilter ``` The benchmarking tool is going to print the path to the `.etl` trace file. You should open it with PerfView or Windows Performance Analyzer and start the analysis from there. If you are not familiar with PerfView, you should watch [PerfView Tutorial](https://channel9.msdn.com/Series/PerfView-Tutorial) by @vancem first. It's an investment that is going to pay off very quickly. @@ -185,7 +214,7 @@ BenchmarkDotNet has some extra features that might be useful when doing performa - You can run the benchmarks against [multiple Runtimes](./benchmarkdotnet.md#Multiple-Runtimes). It can be very useful when the regression has been introduced between .NET Core releases, for example: between netcoreapp2.2 and netcoreapp3.0. - You can run the benchmarks using provided [dotnet cli](./benchmarkdotnet.md#dotnet-cli). You can download few dotnet SDKs, unzip them and just run the benchmarks to spot the version that has introduced the regression to narrow down your investigation. -- You can run the benchmarks using few [CoreRuns](./benchmarkdotnet.md#CoreRun). You can build the latest CoreFX in Release, create a copy of the folder with CoreRun and use git to checkout an older commit. Then rebuild CoreFX and run the benchmarks against the old and new builds. This can narrow down your investigation to the commit that has introduced the bug. +- You can run the benchmarks using few [CoreRuns](./benchmarkdotnet.md#CoreRun). You can build the latest dotnet runtime in Release, create a copy of the folder with CoreRun and use git to checkout an older commit. Then rebuild dotnet runtime and run the benchmarks against the old and new builds. This can narrow down your investigation to the commit that has introduced the bug. ### Confirmation @@ -193,48 +222,16 @@ When you identify and fix the regression, you should use [ResultsComparer](../sr Please take a moment to consider how the regression managed to enter the product. Are we now properly protected? -## Local CoreCLR Build - -Sometimes you might need to run the benchmarks using not only local CoreFX but also local CoreCLR build. - -Thanks to the simplicity of CoreRun, all you need to do is copy all the runtimes files into the folder with CoreRun. - -But before you do it, you should copy/remember the version of CoreCLR reported by BenchmarkDotNet: - -```log -BenchmarkDotNet=v0.11.3.1003-nightly, OS=Windows 10.0.17763.253 (1809/October2018Update/Redstone5) -Intel Xeon CPU E5-1650 v4 3.60GHz, 1 CPU, 12 logical and 6 physical cores -.NET Core SDK=3.0.100-preview-009812 - [Host] : .NET Core 3.0.0-preview-27122-01 (CoreCLR 4.6.27121.03, CoreFX 4.7.18.57103), 64bit RyuJIT - Job-SBBRNM : .NET Core ? (CoreCLR 4.6.27416.73, CoreFX 4.7.19.11901), 64bit RyuJIT -``` - -As you can see, before the "update" the version for the Job (not the Host process) was `4.6.27416.73`. - -The CoreFX build system has a built-in support for that, exposed by the [CoreCLROverridePath](https://github.com/dotnet/corefx/blob/0e7236fda21a07302b14030c82f79bb981c723a6/Documentation/project-docs/developer-guide.md#testing-with-private-coreclr-bits) build parameter: - -```cmd -C:\Projects\corefx> build -c Release /p:CoreCLROverridePath="C:\Projects\coreclr\bin\Product\Windows_NT.x64.Release" -``` - -After the update, the reported CoreCLR version should be changed: - -```log - [Host] : .NET Core 3.0.0-preview-27122-01 (CoreCLR 4.6.27121.03, CoreFX 4.7.18.57103), 64bit RyuJIT - Job-CYVJFZ : .NET Core ? (CoreCLR 4.6.27517.0, CoreFX 4.7.19.11901), 64bit RyuJIT -``` - -**It's very important to validate the reported version numbers** to make sure that you are running the benchmarks using the versions you think you are using. ## Benchmarking new API -When developing new CoreFX features, we should be thinking about the performance from day one. One part of doing this is writing benchmarks at the same time when we write our first unit tests. Keeping the benchmarks in a separate repository makes it a little bit harder to run the benchmarks against new CoreFX API, but it's still very easy. +When developing new dotnet runtime features, we should be thinking about the performance from day one. One part of doing this is writing benchmarks at the same time when we write our first unit tests. Keeping the benchmarks in a separate repository makes it a little bit harder to run the benchmarks against new API, but it's still very easy. ### Reference -When you develop a new feature, whether it's a new method/type/library in CoreFX all you need to do is to build it in Release and just reference the produced implementation `.dll` from the [MicroBenchmarks.csproj](../src/benchmarks/micro/MicroBenchmarks.csproj) project file. +When you develop a new feature, whether it's a new method/type/library all you need to do is to build it in Release and just reference the produced implementation `.dll` from the [MicroBenchmarks.csproj](../src/benchmarks/micro/MicroBenchmarks.csproj) project file. -The easiest way to do it is to open [MicroBenchmarks.sln](../src/benchmarks/micro/MicroBenchmarks.sln) with Visual Studio, right click on the [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj) project file, select "Add", then "Reference..." and in the new Dialog Window click "Browse" in the left bottom corner. From the File Picker, choose the new library and click "Add". Make sure to pick the reference assembly (not implementation assembly) from corefx which falls under path `artifacts\bin\ref\netcoreapp\`. Next, from the Solution Explorer window expand Dependencies for MicroBenchmarks solution and after selecting the assembly which you just added, set CopyLocal value to `No` from within the Properties window. Please don't forget to Save the changes (Ctrl+Shift+S). From this moment you should be able to consume new public types and methods exposed by the referenced library. +The easiest way to do it is to open [MicroBenchmarks.sln](../src/benchmarks/micro/MicroBenchmarks.sln) with Visual Studio, right click on the [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj) project file, select "Add", then "Reference..." and in the new Dialog Window click "Browse" in the left bottom corner. From the File Picker, choose the new library and click "Add". Make sure to pick the reference assembly (not implementation assembly) which falls under path `artifacts\bin\ref\netcoreapp\`. Next, from the Solution Explorer window expand Dependencies for MicroBenchmarks solution and after selecting the assembly which you just added, set CopyLocal value to `No` from within the Properties window. Please don't forget to Save the changes (Ctrl+Shift+S). From this moment you should be able to consume new public types and methods exposed by the referenced library. Sample changes: @@ -254,7 +251,7 @@ Sample project file change: ```xml - ..\..\..\..\corefx\artifacts\bin\ref\netcoreapp\System.Console.dll + ..\..\..\..\runtime\artifacts\bin\ref\netcoreapp\System.Console.dll false @@ -262,13 +259,13 @@ Sample project file change: ### PR -Because the benchmarks are not in the CoreFX repository you must do two PR's. +Because the benchmarks are not in the dotnet runtime repository you must do two PR's. -The first thing you need to do is send a PR with the new API to the CoreFX repository. Once your PR gets merged and a new NuGet package is published to the CoreFX NuGet feed, you should remove the Reference to a `.dll` and install/update the package consumed by [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj). You can do this by running the following script locally: +The first thing you need to do is send a PR with the new API to the dotnet runtime repository. Once your PR gets merged and a new NuGet package is published to the dotnet runtime NuGet feed, you should remove the Reference to a `.dll` and install/update the package consumed by [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj). You can do this by running the following script locally: ```cmd -$Python3 ./scripts/benchmarks_ci.py --filter $YourFilter -f netcoreapp3.0 --incremental no --architecture x64 +/home/adsitnik/projects/performance>python3 ./scripts/benchmarks_ci.py --filter $YourFilter -f netcoreapp5.0 ``` -This script will try to pull the latest .NET Core SDK from CoreFX nightly build, which should contain the new API that you just merged in your first PR, and use that to build MicroBenchmarks project and then run the benchmarks that satisfy the filter you provided. +This script will try to pull the latest .NET Core SDK from dotnet runtime nightly build, which should contain the new API that you just merged in your first PR, and use that to build MicroBenchmarks project and then run the benchmarks that satisfy the filter you provided. After you have confirmed your benchmarks successfully run locally, then your PR should be ready for performance repo. From c6f46f4e662f8ad60f5d4d288f4ea85b2b98c0c9 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 14:53:14 +0100 Subject: [PATCH 10/16] remove old benchmarking workflow doc --- docs/benchmarking-workflow.md | 351 ---------------------------------- 1 file changed, 351 deletions(-) delete mode 100644 docs/benchmarking-workflow.md diff --git a/docs/benchmarking-workflow.md b/docs/benchmarking-workflow.md deleted file mode 100644 index a3b5a2d88dd..00000000000 --- a/docs/benchmarking-workflow.md +++ /dev/null @@ -1,351 +0,0 @@ -# .NET benchmarking workflow - -## Table of Contents - -- [Pre-requisites](#Pre-requisites) - - [Clone](#Clone) - - [Build](#Build) -- [Choosing the benchmarks](#Choosing-the-benchmarks) - - [Filtering Examples](#Filtering-Examples) - - [Benchmark not found](#Benchmark-not-found) -- [Running the benchmarks](#Running-the-benchmarks) - - [Against single runtime](#Against-single-runtime) - - [Against multiple runtimes](#Against-multiple-runtimes) - - [Against single runtime using given dotnet cli](#Against-single-runtime-using-given-dotnet-cli) - - [Against private runtime build](#Against-private-runtime-build) -- [Workflows](#Workflows) - - [Improving the performance](#Improving-the-performance) - - [Checking for regressions](#Checking-for-regressions) - - [Comparing different runtimes](#Comparing-different-runtimes) - - [New API](#New-API) - -## Pre-requisites - -### Clone - -To run the benchmarks you need to clone the `dotnet/performance` repository first. - -```cmd -git clone https://github.com/dotnet/performance.git -``` - -This repository is **independent from CoreFX and CoreCLR build systems!** So you need to do this **only ONCE**, no matter how many .NET Runtimes you want to run the benchmarks against. - -### Build - -To build the benchmarks you need to have the right `dotnet cli`. This repository allows to benchmark .NET Core 2.0, 2.1, 2.2 and 3.0 so you need to install all of them. - -- .NET Core 2.0, 2.1 and 2.2 can be installed from [https://www.microsoft.com/net/download/archives](https://www.microsoft.com/net/download/archives) -- .NET Core 3.0 preview is available at [https://github.com/dotnet/core-sdk#installers-and-binaries](https://github.com/dotnet/core-sdk#installers-and-binaries) - -If you don't want to install all of them and just run the benchmarks for selected runtime(s), you need to manually edit the [common.props](../src/benchmarks/micro/common.props) file. - -```diff -- netcoreapp2.1;netcoreapp2.2;netcoreapp3.0 -+ netcoreapp2.1 -``` - -Once you have it, you can build the [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj) project. Please do remember that the default configuration for `dotnet cli` is `Debug`. Running benchmarks in `Debug` makes no sense, so please **always build and run it in `Release` mode**. - -```cmd -cd performance\src\benchmarks\micro -dotnet build -c Release -``` - -## Choosing the benchmarks - -The project contains few thousands of benchmarks and you most probably don't need to run all of them. - -The benchmarks are: - -- grouped into corresponding namespaces. If given .NET class belongs to `System.XYZ` namespace, it's benchmarks do so as well. -- grouped into categories. CoreCLR benchmarks belong to `CoreCLR` category, CoreFX to `CoreFX` category. Features that are partially implemented in the Runtime and Base Class Library belong to common categories like `Span`, `LINQ`. (See [Categories.cs](../src/benchmarks/micro/Categories.cs) for more). - -The harness (BenchmarkDotNet) allows to: - -- filter the benchmarks by using glob expression applied to their full names (`namespace.typeName.methodName(arguments)`). This is exposed by `--filter` or just `-f` command line argument. -- filter the benchmarks by categories. This is exposed by `--allCategories` and `--anyCategories` command line arguments. -- print a list of available benchmarks by using `--list flat` or `--list tree` command line arguments. -- `--list` can be combined with `--filter` and (`--allCategories` or `--anyCategories`). - -The best way to find the benchmarks you want to run is either to open [MicroBenchmarks.sln](../src/benchmarks/micro/MicroBenchmarks.sln) in your favourite IDE and search for type usages or use command line arguments to filter. We expect that our users will start with the IDE approach and over the time switch to console line arguments once they got used to existing conventions. - -### Filtering Examples - -Sample commands: - -- See the list of all available .NET Core 2.1 System.Linq benchmarks: - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- -f System.Linq* --list flat -``` - -```log -System.Linq.Tests.Perf_Linq.Select -System.Linq.Tests.Perf_Linq.SelectSelect -System.Linq.Tests.Perf_Linq.Where -System.Linq.Tests.Perf_Linq.WhereWhere -System.Linq.Tests.Perf_Linq.WhereSelect -System.Linq.Tests.Perf_Linq.Cast_ToBaseClass -System.Linq.Tests.Perf_Linq.Cast_SameType -System.Linq.Tests.Perf_Linq.OrderBy -System.Linq.Tests.Perf_Linq.OrderByDescending -System.Linq.Tests.Perf_Linq.OrderByThenBy -System.Linq.Tests.Perf_Linq.Reverse -System.Linq.Tests.Perf_Linq.Skip -System.Linq.Tests.Perf_Linq.Take -System.Linq.Tests.Perf_Linq.SkipTake -System.Linq.Tests.Perf_Linq.ToArray -System.Linq.Tests.Perf_Linq.ToList -System.Linq.Tests.Perf_Linq.ToDictionary -System.Linq.Tests.Perf_Linq.Contains_ElementNotFound -System.Linq.Tests.Perf_Linq.Contains_FirstElementMatches -System.Linq.Tests.Perf_Linq.Range -``` - -- See a hierarchy tree of all available .NET Core 3.0 System.IO.Compression benchmarks: - -```cmd -dotnet run -c Release -f netcoreapp3.0 -- -f System.IO.Compression* --list tree -``` - -```log -System - └─IO - └─Compression - ├─Brotli - │ ├─Compress_WithState - │ ├─Decompress_WithState - │ ├─Compress_WithoutState - │ ├─Decompress_WithoutState - │ ├─Compress - │ └─Decompress - ├─Deflate - │ ├─Compress - │ └─Decompress - └─Gzip - ├─Compress - └─Decompress -``` - -- See a list of all the benchmarks which belong to BenchmarksGame category: - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- --allCategories BenchmarksGame --list flat -``` - -```log -BenchmarksGame.BinaryTrees_2.RunBench -BenchmarksGame.BinaryTrees_5.RunBench -BenchmarksGame.FannkuchRedux_2.RunBench -BenchmarksGame.FannkuchRedux_5.RunBench -BenchmarksGame.Fasta_1.RunBench -BenchmarksGame.Fasta_2.RunBench -BenchmarksGame.KNucleotide_1.RunBench -BenchmarksGame.KNucleotide_9.RunBench -BenchmarksGame.Mandelbrot_2.Bench -BenchmarksGame.MandelBrot_7.Bench -BenchmarksGame.NBody_3.RunBench -BenchmarksGame.PiDigits_3.RunBench -BenchmarksGame.RegexRedux_1.RunBench -BenchmarksGame.RegexRedux_5.RunBench -BenchmarksGame.ReverseComplement_1.RunBench -BenchmarksGame.ReverseComplement_6.RunBench -BenchmarksGame.SpectralNorm_1.RunBench -BenchmarksGame.SpectralNorm_3.RunBench -``` - -### Benchmark not found - -**If there are no benchmarks for the feature that you want to measure, you should write new ones following the existing guidelines.** - -## Running the benchmarks - -### Against single runtime - -Just specify the target framework moniker for `dotnet run`. - -Example: run `System.Collections.CopyTo.Array` benchmarks against .NET Core 2.1 installed on your machine: - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- -f System.Collections.CopyTo.Array -``` - -### Against multiple runtimes - -You need to specify the target framework monikers via `--runtimes` or just `-r` option: - -Example: run `System.Collections.CopyTo.Array` benchmarks against .NET Core 2.0 and 2.1 installed on your machine: - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- -f System.Collections.CopyTo.Array --runtimes netcoreapp2.1 -``` - -**Important:** when comparing few different .NET runtimes please always use the lowest common API denominator as the host process. What does it mean? BDN needs to detect and build these benchmarks. If you run the host process as .NET Core 2.1 it won't be able to detect benchmarks that use newer APIs are available only for .NET Core 3.0. - -Example: run benchmarks for APIs available in .NET Core 2.1 using .NET Core 3.0 - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- -r netcoreapp3.0 -``` - -Example: run benchmarks for APIs available in .NET Core 3.0 using .NET Core 3.0 - -```cmd -dotnet run -c Release -f netcoreapp3.0 -``` - -### Against single runtime using given dotnet cli - -Specify the target framework moniker for `dotnet run` and the path to `dotnet cli` via `--cli` argument. - -Example: run `System.Collections.CopyTo.Array` benchmarks against .NET Core 3.0 downloaded to a given location: - -```cmd -dotnet run -c Release -f netcoreapp3.0 -- -f System.Collections.CopyTo.Array --cli C:\tmp\dotnetcli\dotnet.exe -``` - -### Against private runtime build - -Pass the path to CoreRun using `--coreRun` argument. In both CoreCLR and CoreFX you are going to find few CoreRun.exe files. **Use the one that has framework assemblies in the same folder**. Examples: - -- "C:\Projects\coreclr\bin\tests\Windows_NT.x64.Release\Tests\Core_Root\CoreRun.exe" -- "C:\Projects\corefx\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" - -**Note:** BenchmarkDotNet expects a path to `CoreRun.exe` file (`corerun` on Unix), not to `Core_Root` folder. - -Example: Run all CoreCLR benchmarks using "C:\Projects\corefx\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" - -```cmd -dotnet run -c Release -f netcoreapp3.0 -- --allCategories CoreCLR --coreRun "C:\Projects\corefx\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" -``` - -If you want to use some non-default dotnet cli (or you just don't have a default dotnet cli) to build the benchmarks pass the path to cli via `--cli`. -If you want restore the packages to selected folder, pass it via `--packages`. - -Example: Run all CoreCLR benchmarks using "C:\Projects\coreclr\bin\tests\Windows_NT.x64.Release\Tests\Core_Root\CoreRun.exe", restore the packages to C:\Projects\coreclr\packages and use "C:\Projects\coreclr\Tools\dotnetcli\dotnet.exe" for building the benchmarks. - -```cmd -dotnet run -c Release -f netcoreapp3.0 -- --allCategories CoreCLR --coreRun "C:\Projects\coreclr\bin\tests\Windows_NT.x64.Release\Tests\Core_Root\CoreRun.exe --cli "C:\Projects\coreclr\Tools\dotnetcli\dotnet.exe" --packages "C:\Projects\coreclr\packages" -``` - -**VERY IMPORTANT**: CoreRun is a simple host that does NOT take any dependency on NuGet. BenchmarkDotNet just generates some boilerplate code, builds it and tells CoreRun.exe to run the benchmarks from the auto-generated library. CoreRun runs the benchmarks using the libraries that are placed in it's folder. When benchmarked code has a dependency to `System.ABC.dll` version 4.5 and CoreRun has `System.ABC.dll` version 4.5.1 in it's folder, then CoreRun is going to load and use `System.ABC.dll` version 4.5.1. This is why having a single clone of .NET Performance repository allows you to run benchmarks against private builds of CoreCLR/FX from many different locations. - -## Workflows - -Make sure you read [Pre-requisites](#Pre-requisites), [Choosing the benchmarks](#Choosing-the-benchmarks) and [Running the benchmarks](#Running-the-benchmarks) first!! - -To get the best of available tooling you should also read: - -- [How to read the Memory Statistics](../src/benchmarks/micro/README.md#How-to-read-the-Memory-Statistics) -- [How to get the Disassembly](../src/benchmarks/micro/README.md#How-to-get-the-Disassembly) -- [How to profile benchmarked code using ETW](../src/benchmarks/micro/README.md#How-to-profile-benchmarked-code-using-ETW) - -By using the `DisassemblyDiagnoser` and `EtwProfiler` you should be able to get full disassembly and detailed profile information. No code modification is required, every feature is available from command line level! - -### Improving the performance - -1. [Choose the benchmarks](#Choosing-the-benchmarks) that test given feature. -2. Run the benchmarks without your changes first - 1. clone your fork of selected product repo - CoreFX/CoreCLR - 2. build it in release, including tests - 3. locate the path to **right** `CoreRun.exe` (the one with all framework dependencies next to it) - 4. go to the folder with benchmarks (`cd dotnet/performance/src/benchmarks/micro`) - 5. run the benchmarks using given `CoreRun.exe` and save the results to a dedicated folder. An example: - - ```cmd - dotnet run -c Release -f netcoreapp3.0 -- - --artifacts before - --filter *Span* - --coreRun "C:\Projects\corefx\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" - ``` - -3. Use at least one of the available BenchmarkDotNet features: `MemoryDiagnoser`, `DisassemblyDiagnoser` or `EtwProfiler` to get more performance data. -4. Analyze the data, identify performance bottlenecks. -5. Apply your changes to fix the performance bottlenecks. -6. Rebuild the product and tests in `Release` mode. Verify that the modified files got copied to the folder with `CoreRun`. -7. Run the benchmarks using given `CoreRun.exe` and save the results to a dedicated folder. **Different one that you used to store results previously!** Example: - - ```cmd - dotnet run -c Release -f netcoreapp3.0 -- --artifacts after --filter *Span* --coreRun "C:\Projects\corefx\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" - ``` - -8. Compare the results using [Results Comparer](../src/tools/ResultsComparer/README.md) - - ```cmd - dotnet run -p ..\..\tools\ResultsComparer\ResultsComparer.csproj --base .\before\ --diff .\after\ --threshold 3% - ``` - -9. Repeat steps 3-8 until you get the desired speedup. - -### Checking for regressions using Statistical Test - -To perform a Mann–Whitney U Test and display the results in a dedicated column you need to provide the threshold for statistical test (Examples: 5%, 10ms, 100ns, 1s): - - `--statisticalTest ` - -Example: run Mann–Whitney U test with an absolute ratio of 3 milliseconds and compare the CoreFX located in `C:\Projects\corefx_upstream\` vs `C:\Projects\corefx_fork\` for BenchmarksGame benchmarks. - -The following commands are represented in a few lines to make it easier to read on GitHub. Please remove the new lines when copy-pasting to console. - -```cmd -dotnet run -c Release -f netcoreapp3.0 \ - --allCategories BenchmarksGame \ - --statisticalTest 3ms \ - --coreRun \ - "C:\Projects\corefx_upstream\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" \ - "C:\Projects\corefx_fork\bin\runtime\netcoreapp-Windows_NT-Release-x64\CoreRun.exe" -``` - -Example: run all benchmarks for .NET Core 2.1 vs 2.2 and use Mann–Whitney U test with a relative ratio of 5%. - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- - --filter * - --statisticalTest 5% - --runtimes netcoreapp2.1 netcoreapp2.2 -``` - -**Note:** some of our benchmarks are dependent on the alignment. You can use `--launchCount` option to specify how many processes BenchmarkDotNet should start to run given benchmarks. BDN does it sequentially. It's recommended to use this feature when releasing a new version of .NET Framework. - -**Note:** you don't need two copies of CoreCLR/FX to compare the performance. But in that case, you have to run the benchmarks at least once before applying any changes. To compare the historical results you need to use [Results Comparer](../src/tools/ResultsComparer/README.md) - -### Comparing different runtimes - -A must read is [running benchmarks against multiple runtimes](#Against-multiple-runtimes). All you need to do is to specify the runtime name and path to cli (if required). - -Example: run all `Span` benchmarks for .NET Core 2.1 vs 3.0: - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- --allCategories Span --runtimes netcoreapp2.1 netcoreapp3.0 -``` - -Example: run all `System.IO` benchmarks for .NET 4.7.2 vs .NET Core 3.0 preview using dotnet cli from given location: - -```cmd -dotnet run -c Release -f net472 -- --filter System.IO* --runtimes net472 netcoreapp3.0 --cli "C:\Downloads\3.0.0-preview1-03129-01\dotnet.exe" -``` - -Example: run all benchmarks for .NET Core 2.1 vs 2.2: - -```cmd -dotnet run -c Release -f netcoreapp2.1 -- -f * --runtimes netcoreapp2.1 netcoreapp2.2 -``` - -### New API - -In case you want to add a new method to CoreFX and test its performance, then you need to follow [Benchmarking .NET Core applications](https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/benchmarking.md). - -### Troubleshooting - -BenchmarkDotNet uses MSBuild to build the auto-generated project with benchmarks. If you ever get following error: - -```log -/home/username/dotnet30/sdk/3.0.100-preview-009750/Microsoft.Common.CurrentVersion.targets(4551,5): warning MSB3026: Could not copy "/home/username/git/performance/src/benchmarks/micro/obj/Release/netcoreapp3.0/MicroBenchmarks" to "bin/Release/netcoreapp3.0/MicroBenchmarks". Beginning retry 1 in 1000ms. Text file busy [/home/username/git/performance/src/benchmarks/micro/MicroBenchmarks.csproj] -``` - -Please: - -1. Try to re-run the command once. -2. If re-run does not help, please remove `bin` and `obj` folders and try again. -3. If it still does not work, follow [Troubleshooting guidelines](https://benchmarkdotnet.org/articles/guides/troubleshooting.html) From 4742fbd44827527ae6230cec492f26a0238d8fc1 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 14:53:28 +0100 Subject: [PATCH 11/16] update README.md to point to the new docs --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f6132196ec..5e8550829dd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ Finding these benchmarks in a separate repository might be surprising. Performan * [Microbenchmarks Guide](./src/benchmarks/micro/README.md) for information on running our microbenchmarks * [Real-World Scenarios Guide](./src/benchmarks/real-world/JitBench/README.md) for information on running our real-world scenario benchmarks -* [Benchmarking workflow for CoreFX](./docs/benchmarking-workflow-corefx.md) for information on working with CoreFX +* [Benchmarking workflow for dotnet runtime repository](./docs/benchmarking-workflow-dotnet-runtime.md) for information on benchmarking local dotnet runtime builds +* [Profiling workflow for dotnet runtime repository](./docs/profiling-workflow-dotnet-runtime.md) for information on profiling local dotnet runtime builds ## Contributing to Repository From 1521e717f3da84734383a3d99496f0601e45e7eb Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 20:51:34 +0100 Subject: [PATCH 12/16] Apply suggestions from code review Co-Authored-By: Bill Wert --- docs/benchmarking-workflow-dotnet-runtime.md | 2 +- src/benchmarks/micro/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/benchmarking-workflow-dotnet-runtime.md b/docs/benchmarking-workflow-dotnet-runtime.md index 1757c84bc85..c5b6edc475b 100644 --- a/docs/benchmarking-workflow-dotnet-runtime.md +++ b/docs/benchmarking-workflow-dotnet-runtime.md @@ -98,7 +98,7 @@ Please remember that you can filter the benchmarks using a glob pattern applied dotnet run -c Release -f netcoreapp5.0 --filter System.Memory* ``` -Moreover, every Libaries (new name for CoreFX) benchmark belongs to a [Libraries category](../src/benchmarks/micro/README.md#Categories). Same goes for Runtime (old name was CoreCLR). +Moreover, every Libaries benchmark belongs to a [Libraries category](../src/benchmarks/micro/README.md#Categories). Same goes for Runtime. ### dotnet runtime Prerequisites diff --git a/src/benchmarks/micro/README.md b/src/benchmarks/micro/README.md index 995df464103..e0ae54a2a90 100644 --- a/src/benchmarks/micro/README.md +++ b/src/benchmarks/micro/README.md @@ -94,6 +94,6 @@ public class SomeType This is possible with the `AllowedOperatingSystemsAttribute`. You need to provide a mandatory comment and OS(es) that benchmark(s) can run on. ```cs -[AllowedOperatingSystems("Hangs on non-Windows, dotnet/runtime#18290", OS.Windows)] +[AllowedOperatingSystems("Hangs on non-Windows, dotnet/corefx#18290", OS.Windows)] public class Perf_PipeTest ``` From 9bda8d9897896206af3bbf0538add47f7b36ba00 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 20:54:04 +0100 Subject: [PATCH 13/16] revert accidental TFM removal --- src/benchmarks/micro/MicroBenchmarks.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/benchmarks/micro/MicroBenchmarks.csproj b/src/benchmarks/micro/MicroBenchmarks.csproj index 7d35294c6c5..79c8f504c61 100644 --- a/src/benchmarks/micro/MicroBenchmarks.csproj +++ b/src/benchmarks/micro/MicroBenchmarks.csproj @@ -4,8 +4,8 @@ $(PERFLAB_TARGET_FRAMEWORKS) - net461;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0 - netcoreapp2.1;netcoreapp2.2;netcoreapp3.0 + net461;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp5.0 + netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp5.0 Exe AnyCPU From f4a7069a482ab79218c7ecde5022f386439106a2 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 20:59:52 +0100 Subject: [PATCH 14/16] dotnet runtime -> dotnet/runtime --- README.md | 4 +-- docs/benchmarkdotnet.md | 2 +- docs/benchmarking-workflow-dotnet-runtime.md | 26 +++++++++--------- docs/microbenchmark-design-guidelines.md | 2 +- docs/profiling-workflow-dotnet-runtime.md | 28 ++++++++++---------- src/benchmarks/micro/README.md | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 5e8550829dd..03abfb086f2 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Finding these benchmarks in a separate repository might be surprising. Performan * [Microbenchmarks Guide](./src/benchmarks/micro/README.md) for information on running our microbenchmarks * [Real-World Scenarios Guide](./src/benchmarks/real-world/JitBench/README.md) for information on running our real-world scenario benchmarks -* [Benchmarking workflow for dotnet runtime repository](./docs/benchmarking-workflow-dotnet-runtime.md) for information on benchmarking local dotnet runtime builds -* [Profiling workflow for dotnet runtime repository](./docs/profiling-workflow-dotnet-runtime.md) for information on profiling local dotnet runtime builds +* [Benchmarking workflow for dotnet/runtime repository](./docs/benchmarking-workflow-dotnet-runtime.md) for information on benchmarking local [dotnet/runtime](https://github.com/dotnet/runtime) builds +* [Profiling workflow for dotnet/runtime repository](./docs/profiling-workflow-dotnet-runtime.md) for information on profiling local [dotnet/runtime](https://github.com/dotnet/runtime) builds ## Contributing to Repository diff --git a/docs/benchmarkdotnet.md b/docs/benchmarkdotnet.md index da55ab2de6c..4c1a46ac052 100644 --- a/docs/benchmarkdotnet.md +++ b/docs/benchmarkdotnet.md @@ -324,7 +324,7 @@ Please use this option only when you are sure that the benchmarks you want to ru ### CoreRun -It's possible to benchmark private builds of dotnet runtime using CoreRun. +It's possible to benchmark private builds of [dotnet/runtime](https://github.com/dotnet/runtime) using CoreRun. ```cmd dotnet run -c Release -f netcoreapp3.0 --coreRun $thePath diff --git a/docs/benchmarking-workflow-dotnet-runtime.md b/docs/benchmarking-workflow-dotnet-runtime.md index c5b6edc475b..10bb6313e1f 100644 --- a/docs/benchmarking-workflow-dotnet-runtime.md +++ b/docs/benchmarking-workflow-dotnet-runtime.md @@ -1,10 +1,10 @@ -# Benchmarking workflow for dotnet runtime repository +# Benchmarking workflow for [dotnet/runtime](https://github.com/dotnet/runtime) repository ## Table of Contents - [Introduction](#Introduction) - [Code Organization](#Code-Organization) - - [dotnet runtime Prerequisites](#dotnet-runtime-Prerequisites) + - [dotnet/runtime Prerequisites](#dotnet-runtime-Prerequisites) - [Preventing Regressions](#Preventing-Regressions) - [Solving Regressions](#Solving-Regressions) - [Repro Case](#Repro-Case) @@ -102,15 +102,15 @@ Moreover, every Libaries benchmark belongs to a [Libraries category](../src/benc ### dotnet runtime Prerequisites -In order to run the benchmarks against local dotnet runtime build you need to build the dotnet/runtime repository in **Release**: +In order to run the benchmarks against local [dotnet/runtime](https://github.com/dotnet/runtime) build you need to build the dotnet/runtime repository in **Release**: ```cmd C:\Projects\runtime> build -c Release ``` -**The most important build artifact for us is CoreRun**. CoreRun is a simple host that does NOT take any dependency on NuGet. BenchmarkDotNet generates some boilerplate code, builds it using dotnet cli and tells CoreRun.exe to run the benchmarks from the auto-generated library. CoreRun runs the benchmarks using the libraries that are placed in its folder. When a benchmarked code has a dependency to `System.ABC.dll` version 4.5 and CoreRun has `System.ABC.dll` version 4.5.1 in its folder, then CoreRun is going to load and use `System.ABC.dll` version 4.5.1. **This means that with a single clone of this dotnet/performance repository you can run benchmarks against private builds of dotnet runtime from many different locations.** +**The most important build artifact for us is CoreRun**. CoreRun is a simple host that does NOT take any dependency on NuGet. BenchmarkDotNet generates some boilerplate code, builds it using dotnet cli and tells CoreRun.exe to run the benchmarks from the auto-generated library. CoreRun runs the benchmarks using the libraries that are placed in its folder. When a benchmarked code has a dependency to `System.ABC.dll` version 4.5 and CoreRun has `System.ABC.dll` version 4.5.1 in its folder, then CoreRun is going to load and use `System.ABC.dll` version 4.5.1. **This means that with a single clone of this dotnet/performance repository you can run benchmarks against private builds of [dotnet/runtime](https://github.com/dotnet/runtime) from many different locations.** -Every time you want to run the benchmarks against local build of dotnet runtime you need to provide the path to CoreRun: +Every time you want to run the benchmarks against local build of [dotnet/runtime](https://github.com/dotnet/runtime) you need to provide the path to CoreRun: ```cmd dotnet run -c Release -f netcoreapp5.0 --filter $someFilter \ @@ -119,7 +119,7 @@ dotnet run -c Release -f netcoreapp5.0 --filter $someFilter \ **Note:** BenchmarkDotNet expects a path to `CoreRun.exe` file (`corerun` on Unix), not to `Core_Root` folder. -Once you rebuild the part of dotnet runtime you are working on, the appropriate `.dll` gets updated and the next time you run the benchmarks, CoreRun is going to load the updated library. +Once you rebuild the part of [dotnet/runtime](https://github.com/dotnet/runtime) you are working on, the appropriate `.dll` gets updated and the next time you run the benchmarks, CoreRun is going to load the updated library. ```cmd C:\Projects\runtime\src\libraries\System.Text.RegularExpressions\src> dotnet msbuild /p:ConfigurationGroup=Release @@ -142,7 +142,7 @@ Please try to **avoid running any resource-heavy processes** that could **spoil* You can also create a **copy** of the folder with CoreRun and all the libraries to be able to run the benchmarks against the **unmodified base** in the future. -After you introduce the changes and rebuild the part of dotnet runtime that you are working on **in Release** you should re-run the benchmarks. Remember to store the results in a different folder. +After you introduce the changes and rebuild the part of [dotnet/runtime](https://github.com/dotnet/runtime) that you are working on **in Release** you should re-run the benchmarks. Remember to store the results in a different folder. ```cmd C:\Projects\runtime\src\libraries\System.IO.Pipes\src> dotnet msbuild /p:ConfigurationGroup=Release @@ -189,7 +189,7 @@ The next step is to send a PR to this repository with the aforementioned benchma ### Profiling -The real performance investigation starts with profiling. We have a comprehensive guide about profiling dotnet runtime, we really encourage you to read it: [Profiling dotnet runtime workflow](./profiling-workflow-dotnet-runtime.md). +The real performance investigation starts with profiling. We have a comprehensive guide about profiling [dotnet/runtime](https://github.com/dotnet/runtime), we really encourage you to read it: [Profiling [dotnet/runtime](https://github.com/dotnet/runtime) workflow](./profiling-workflow-dotnet-runtime.md). To profile the benchmarked code and produce an ETW Trace file ([read more](./benchmarkdotnet.md#Profiling)): @@ -214,7 +214,7 @@ BenchmarkDotNet has some extra features that might be useful when doing performa - You can run the benchmarks against [multiple Runtimes](./benchmarkdotnet.md#Multiple-Runtimes). It can be very useful when the regression has been introduced between .NET Core releases, for example: between netcoreapp2.2 and netcoreapp3.0. - You can run the benchmarks using provided [dotnet cli](./benchmarkdotnet.md#dotnet-cli). You can download few dotnet SDKs, unzip them and just run the benchmarks to spot the version that has introduced the regression to narrow down your investigation. -- You can run the benchmarks using few [CoreRuns](./benchmarkdotnet.md#CoreRun). You can build the latest dotnet runtime in Release, create a copy of the folder with CoreRun and use git to checkout an older commit. Then rebuild dotnet runtime and run the benchmarks against the old and new builds. This can narrow down your investigation to the commit that has introduced the bug. +- You can run the benchmarks using few [CoreRuns](./benchmarkdotnet.md#CoreRun). You can build the latest [dotnet/runtime](https://github.com/dotnet/runtime) in Release, create a copy of the folder with CoreRun and use git to checkout an older commit. Then rebuild [dotnet/runtime](https://github.com/dotnet/runtime) and run the benchmarks against the old and new builds. This can narrow down your investigation to the commit that has introduced the bug. ### Confirmation @@ -225,7 +225,7 @@ Please take a moment to consider how the regression managed to enter the product ## Benchmarking new API -When developing new dotnet runtime features, we should be thinking about the performance from day one. One part of doing this is writing benchmarks at the same time when we write our first unit tests. Keeping the benchmarks in a separate repository makes it a little bit harder to run the benchmarks against new API, but it's still very easy. +When developing new [dotnet/runtime](https://github.com/dotnet/runtime) features, we should be thinking about the performance from day one. One part of doing this is writing benchmarks at the same time when we write our first unit tests. Keeping the benchmarks in a separate repository makes it a little bit harder to run the benchmarks against new API, but it's still very easy. ### Reference @@ -259,13 +259,13 @@ Sample project file change: ### PR -Because the benchmarks are not in the dotnet runtime repository you must do two PR's. +Because the benchmarks are not in the [dotnet/runtime](https://github.com/dotnet/runtime) repository you must do two PR's. -The first thing you need to do is send a PR with the new API to the dotnet runtime repository. Once your PR gets merged and a new NuGet package is published to the dotnet runtime NuGet feed, you should remove the Reference to a `.dll` and install/update the package consumed by [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj). You can do this by running the following script locally: +The first thing you need to do is send a PR with the new API to the [dotnet/runtime](https://github.com/dotnet/runtime) repository. Once your PR gets merged and a new NuGet package is published to the [dotnet/runtime](https://github.com/dotnet/runtime) NuGet feed, you should remove the Reference to a `.dll` and install/update the package consumed by [MicroBenchmarks](../src/benchmarks/micro/MicroBenchmarks.csproj). You can do this by running the following script locally: ```cmd /home/adsitnik/projects/performance>python3 ./scripts/benchmarks_ci.py --filter $YourFilter -f netcoreapp5.0 ``` -This script will try to pull the latest .NET Core SDK from dotnet runtime nightly build, which should contain the new API that you just merged in your first PR, and use that to build MicroBenchmarks project and then run the benchmarks that satisfy the filter you provided. +This script will try to pull the latest .NET Core SDK from [dotnet/runtime](https://github.com/dotnet/runtime) nightly build, which should contain the new API that you just merged in your first PR, and use that to build MicroBenchmarks project and then run the benchmarks that satisfy the filter you provided. After you have confirmed your benchmarks successfully run locally, then your PR should be ready for performance repo. diff --git a/docs/microbenchmark-design-guidelines.md b/docs/microbenchmark-design-guidelines.md index e7b547595e1..600767f43c0 100644 --- a/docs/microbenchmark-design-guidelines.md +++ b/docs/microbenchmark-design-guidelines.md @@ -282,7 +282,7 @@ Does it make sense to test the code paths that throw? Should we test the code path for an array with one or zero elements? * No, because it does not perform any actual work. We would be benchmarking a branch and return from the method. If `Reverse` is inlinable, such a benchmark would be measuring the performance of `if (length <= 1)` and the throw checks. -* No, because it's not a common case. Moreover, it's very unlikely that removing this check from the code would pass the dotnet runtime repository code review and regress the performance in the future. +* No, because it's not a common case. Moreover, it's very unlikely that removing this check from the code would pass the [dotnet/runtime](https://github.com/dotnet/runtime) repository code review and regress the performance in the future. So what is left? A loop that does the actual work. Does it make sense to test it for arrays of different sizes? diff --git a/docs/profiling-workflow-dotnet-runtime.md b/docs/profiling-workflow-dotnet-runtime.md index 47efecd69bf..d61515c3b40 100644 --- a/docs/profiling-workflow-dotnet-runtime.md +++ b/docs/profiling-workflow-dotnet-runtime.md @@ -1,4 +1,4 @@ -# Profiling workflow for dotnet runtime repository +# Profiling workflow for [dotnet/runtime](https://github.com/dotnet/runtime) repository ## Table of Contents @@ -34,9 +34,9 @@ # Introduction -**This doc explains how to profile local dotnet runtime builds and it's targetted at dotnet runtime repository contributors.** +**This doc explains how to profile local [dotnet/runtime](https://github.com/dotnet/runtime) builds and it's targetted at [dotnet/runtime](https://github.com/dotnet/runtime) repository contributors.** -Before you start any performance investigation, you need to [build](#Build) dotnet runtime in **Release**, create a small [repro](#Repro) app and change the default [project settings](#Project-Settings). +Before you start any performance investigation, you need to [build](#Build) [dotnet/runtime](https://github.com/dotnet/runtime) in **Release**, create a small [repro](#Repro) app and change the default [project settings](#Project-Settings). The next step is to choose the right profiler depending on the OS: @@ -45,7 +45,7 @@ The next step is to choose the right profiler depending on the OS: * [PerfView](#PerfView) is the ultimate .NET Profiler but it has a high entry cost. If Visual Studio Profiler is not enough, you should switch to [PerfView](#PerfView). * Linux * [dotnet trace](https://github.com/dotnet/diagnostics/blob/master/documentation/dotnet-trace-instructions.md) works on every OS, it's easy to use and it should be your **default choice** on Unix systems. - * [PerfCollect](#PerfCollect) is a simple, yet very powerful script that allows for profiling native parts of dotnet runtime. You should use it if `dotnet trace` can not handle your case. + * [PerfCollect](#PerfCollect) is a simple, yet very powerful script that allows for profiling native parts of .NET Core. You should use it if `dotnet trace` can not handle your case. If you clearly need information on CPU instruction level, then depending on the hardware you should use [Intel VTune](#VTune) or [AMD uProf](https://developer.amd.com/amd-uprof/). @@ -53,7 +53,7 @@ If you clearly need information on CPU instruction level, then depending on the ## Build -You need to build dotnet runtime in Release first: +You need to build [dotnet/runtime](https://github.com/dotnet/runtime) in Release first: ```cmd C:\Projects\runtime> build -c Release @@ -73,7 +73,7 @@ C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\ C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\5.0.0\CoreRun.exe ``` -Once you rebuild the part of dotnet runtime you are working on, the appropriate `.dll` gets updated and the next time you run profiler, dotnet|CoreRun is going to use the updated library. +Once you rebuild the part of [dotnet/runtime](https://github.com/dotnet/runtime) you are working on, the appropriate `.dll` gets updated and the next time you run profiler, dotnet|CoreRun is going to use the updated library. ```cmd C:\Projects\runtime\src\libraries\System.Text.RegularExpressions\src> dotnet msbuild /p:ConfigurationGroup=Release @@ -147,7 +147,7 @@ It's recommended to disable Tiered JIT (to avoid the need of warmup) and emit fu Visual Studio Profiler is not as powerful as PerfView, but it's definitely more intuitive to use. If you don't know which profiler to use, you should use it by default. -To profile a local build of dotnet runtime and get symbol solving working in Visual Studio Profiler you can use the produced `dotnet` or `CoreRun`. +To profile a local build of [dotnet/runtime](https://github.com/dotnet/runtime) and get symbol solving working in Visual Studio Profiler you can use the produced `dotnet` or `CoreRun`. ## dotnet @@ -172,7 +172,7 @@ SET sln=%2 start %sln% ``` -You can just save it as `startvs.cmd` file and run providing path to the `testhost` folder produced by dotnet runtime build and a VS solution with repo project: +You can just save it as `startvs.cmd` file and run providing path to the `testhost` folder produced by [dotnet/runtime](https://github.com/dotnet/runtime) build and a VS solution with repo project: ```cmd startvs.cmd "C:\Projects\runtime\artifacts\bin\testhost\netcoreapp5.0-Windows_NT-Release-x64\" "C:\Projects\repro\ProfilingDocs.sln" @@ -192,7 +192,7 @@ Give VS a few seconds to run. It's important to execute enough code to run for a ![Few seconds](img/vs_profiler_2_few_seconds.png) -By default VS Profiler does not show the [External Code](https://docs.microsoft.com/en-us/visualstudio/profiling/beginners-guide-to-performance-profiling?view=vs-2019#view-external-code) (functions in system and framework component). When you are profiling dotnet runtime this is **the most important thing you care about**. To show the external code click `Filter` then check `Show External Code` and click `Apply` button. +By default VS Profiler does not show the [External Code](https://docs.microsoft.com/en-us/visualstudio/profiling/beginners-guide-to-performance-profiling?view=vs-2019#view-external-code) (functions in system and framework component). When you are profiling [dotnet/runtime](https://github.com/dotnet/runtime) this is **the most important thing you care about**. To show the external code click `Filter` then check `Show External Code` and click `Apply` button. ![Show External code](img/vs_profiler_3_external_code.png) @@ -293,7 +293,7 @@ We can **Collect** profile data by either **Run**ning a standalone executable (o ![Collect Menu Items](img/perfview_1_collect.png) -When profiling local dotnet runtime build it's recommended to **Run** a standalone repro app using CoreRun. +When profiling local [dotnet/runtime](https://github.com/dotnet/runtime) build it's recommended to **Run** a standalone repro app using CoreRun. ![Run CoreRun](img/perfview_2_run_corerun.png) @@ -397,7 +397,7 @@ If you want to view the Source Code of the given method you need to right-click If PerfView fails to show you the source code you should read the `Log` output. If you are unable to make it work and you really care about it you should switch to Visual Studio Profiler. -**Note:** As of today, PerfView keeps the `.pdb` files [opened](https://github.com/microsoft/perfview/pull/979) after showing the source code. It means that if you keep the trace file opened in PerfView and try to rebuild dotnet runtime the build is going to fail. You might need to close PerfView to rebuild dotnet runtime. +**Note:** As of today, PerfView keeps the `.pdb` files [opened](https://github.com/microsoft/perfview/pull/979) after showing the source code. It means that if you keep the trace file opened in PerfView and try to rebuild [dotnet/runtime](https://github.com/dotnet/runtime) the build is going to fail. You might need to close PerfView to rebuild [dotnet/runtime](https://github.com/dotnet/runtime). ## Identifying Regressions @@ -552,7 +552,7 @@ VTune is capable of showing not only the output assembly code but also native an If it ever fails to show the source code (the `Source` button is then greyed out), you can click on the `Search Sources/Binaries` button and specify additional folders that should be searched for symbol and source files. -**Note:** According to the VTune [docs](https://software.intel.com/en-us/vtune-amplifier-help-dialog-box-source-search), the search is non-recursive. So adding just dotnet runtime repo root folder to the list is not enough. +**Note:** According to the VTune [docs](https://software.intel.com/en-us/vtune-amplifier-help-dialog-box-source-search), the search is non-recursive. So adding just [dotnet/runtime](https://github.com/dotnet/runtime) repo root folder to the list is not enough. ![Specify Sources](img/vtune_folders.png) @@ -596,9 +596,9 @@ It can show the disassembly of profiled methods: PerfCollect is a simple, yet very powerful script that allows for profiling .NET Core apps on Linux. It is internally leveraging LTTng and using perf. -In contrary to `dotnet trace` it gives you native call stacks which are very useful when you need to profile native parts of dotnet runtime. +In contrary to `dotnet trace` it gives you native call stacks which are very useful when you need to profile native parts of [dotnet/runtime](https://github.com/dotnet/runtime). -It has it's own excellent [documentation](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/linux-performance-tracing.md) (a **highly recommended read**), the goal of this doc is not to duplicate it, but rather show **how to profile local dotnet runtime build running on a Linux VM from a Windows developer machine**. We need two OSes because as of today only PerfView is capable of opening a `PerfCollect` trace file. +It has it's own excellent [documentation](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/linux-performance-tracing.md) (a **highly recommended read**), the goal of this doc is not to duplicate it, but rather show **how to profile local [dotnet/runtime](https://github.com/dotnet/runtime) build running on a Linux VM from a Windows developer machine**. We need two OSes because as of today only PerfView is capable of opening a `PerfCollect` trace file. ## Preparing Your Machine diff --git a/src/benchmarks/micro/README.md b/src/benchmarks/micro/README.md index e0ae54a2a90..a3b67d5733c 100644 --- a/src/benchmarks/micro/README.md +++ b/src/benchmarks/micro/README.md @@ -48,7 +48,7 @@ dotnet run -c Release -f netcoreapp2.1 --filter * --runtimes netcoreapp2.1 netco ## Private Runtime Builds -If you contribute to [dotnet/runtime](https://github.com/dotnet/runtime) and want to benchmark **local builds of .NET Core** you need to build dotnet runtime in Release (including tests) and then provide the path(s) to CoreRun(s). Provided CoreRun(s) will be used to execute every benchmark in a dedicated process: +If you contribute to [dotnet/runtime](https://github.com/dotnet/runtime) and want to benchmark **local builds of .NET Core** you need to build [dotnet/runtime](https://github.com/dotnet/runtime) in Release (including tests) and then provide the path(s) to CoreRun(s). Provided CoreRun(s) will be used to execute every benchmark in a dedicated process: ```cmd dotnet run -c Release -f netcoreapp3.0 --filter $YourFilter \ From c9a6b08c16ad690b42757363b19262b5e74e277a Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Thu, 16 Jan 2020 21:09:45 +0100 Subject: [PATCH 15/16] update the categories description --- src/benchmarks/micro/README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/benchmarks/micro/README.md b/src/benchmarks/micro/README.md index a3b67d5733c..c5122207b13 100644 --- a/src/benchmarks/micro/README.md +++ b/src/benchmarks/micro/README.md @@ -76,11 +76,7 @@ We once again encourage you to read the [full docs about BenchmarkDotNet](../../ ### Categories -Every micro benchmark should belong to either Runtime, Libraries or ThirdParty category. It allows for proper filtering for CI runs: - -* Runtime - benchmarks belonging to this category are executed for Runtime CI jobs -* Libraries - benchmarks belonging to this category are executed for Libraries CI jobs -* ThirdParty - benchmarks belonging to this category are not going to be executed as part of our daily CI runs. We are going to run them periodically to make sure we don't regress any of the most popular 3rd party libraries. +Every micro benchmark should belong to either Runtime, Libraries or ThirdParty category. It allows for filtering by category. Adding given type/method to particular category requires using a `[BenchmarkCategory]` attribute: From 8f7e613bbb4bb3772678e2b25b2b3dc88ed4224c Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Fri, 17 Jan 2020 10:17:28 +0100 Subject: [PATCH 16/16] change Categories names for real --- azure-pipelines.yml | 22 +++++++++++----------- src/benchmarks/micro/Categories.cs | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a38e8c8bb25..d16540ad2e5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -88,7 +88,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.ClientRS5.Open csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: - master - release/3.1.2xx @@ -103,7 +103,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.ClientRS4.DevEx.15.8.Open csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for public jobs we want to make sure that the PRs don't break any of the supported frameworks - LTS # use LTS channel for net461 framework @@ -117,7 +117,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.ClientRS5.Open csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for public jobs we want to make sure that the PRs don't break x86 - master @@ -162,7 +162,7 @@ jobs: queue: Ubuntu.1804.Amd64.Open container: ubuntu_x64_build_container csproj: src/benchmarks/micro/MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for public jobs we want to make sure that the PRs don't break any of the supported frameworks - master - release/3.1.2xx @@ -232,7 +232,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.19H1.Tiger.Perf # using a dedicated private Helix queue (perftigers) csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 3.0 and 5.0 only - master - release/3.1.2xx @@ -247,7 +247,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.19H1.Tiger.Perf # using a dedicated private Helix queue (perftigers) csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 3.0 and 5.0 only - master - release/3.1.2xx @@ -293,7 +293,7 @@ jobs: queue: Ubuntu.1804.Amd64.Tiger.Perf # using a dedicated private Helix queue (perftigers) container: ubuntu_x64_build_container csproj: src/benchmarks/micro/MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 3.0 and 5.0 only - master - release/3.1.2xx @@ -361,7 +361,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.ClientRS1.Perf # using a dedicated private Helix queue (perfsnakes) csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 5.0 and 3.1 - master - release/3.1.2xx @@ -376,7 +376,7 @@ jobs: pool: Hosted VS2017 queue: Windows.10.Amd64.ClientRS1.Perf # using a dedicated private Helix queue (perfsnakes) csproj: src\benchmarks\micro\MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 5.0 and 3.1 - master - release/3.1.2xx @@ -422,7 +422,7 @@ jobs: queue: Ubuntu.1604.Amd64.Perf # using a dedicated private Helix queue (perfsnakes) container: ubuntu_x64_build_container csproj: src/benchmarks/micro/MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 5.0 and 3.1 - master - release/3.1.2xx @@ -470,7 +470,7 @@ jobs: queue: Ubuntu.1804.Arm64.Perf container: ubuntu_x64_build_container csproj: src/benchmarks/micro/MicroBenchmarks.csproj - runCategories: 'coreclr corefx' + runCategories: 'runtime libraries' channels: # for private jobs we want to benchmark .NET Core 5.0 and 3.1 - master - release/3.1.2xx diff --git a/src/benchmarks/micro/Categories.cs b/src/benchmarks/micro/Categories.cs index 6a64413e527..927515297e3 100644 --- a/src/benchmarks/micro/Categories.cs +++ b/src/benchmarks/micro/Categories.cs @@ -13,14 +13,14 @@ public static class Categories public const string ThirdParty = "ThirdParty"; /// - /// benchmarks belonging to this category are executed for CoreFX CI jobs + /// benchmarks belonging to this category are executed for CI jobs /// - public const string Libraries = "CoreFX"; + public const string Libraries = "Libraries"; /// - /// benchmarks belonging to this category are executed for CoreCLR CI jobs + /// benchmarks belonging to this category are executed for CI jobs /// - public const string Runtime = "CoreCLR"; + public const string Runtime = "Runtime"; public const string BenchmarksGame = "BenchmarksGame"; public const string Benchstones = "Benchstones"; public const string BenchF = "BenchF";