From: Michelle McDaniel <adiaaida@gmail.com>
Date: Mon, 4 Dec 2017 22:01:07 +0000 (-0800)
Subject: Separate large perf benchmarks into their own legs (#15231)
X-Git-Tag: accepted/tizen/base/20180629.140029~403
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6eaf27dac5952ea02e9136e40e2fba7be3774479;p=platform%2Fupstream%2Fcoreclr.git

Separate large perf benchmarks into their own legs (#15231)

Separate large perf benchmarks into their own legs

This change splits the windows perf test stages into 6 pipelined legs per flavor to reduce the amount of time we spend running the perf tests and reduce the total time of the job. This change also decreases the size of the stashed bin directory by deleting the obj directory. Finally, we move the benchstones suite into one directory (moving BenchF and BenchI into a shared dir called Benchstones)
---

diff --git a/buildpipeline/perf-pipeline.groovy b/buildpipeline/perf-pipeline.groovy
index 5921cf6..918b4ef 100644
--- a/buildpipeline/perf-pipeline.groovy
+++ b/buildpipeline/perf-pipeline.groovy
@@ -4,6 +4,18 @@
 // Note that the parameters will be set as env variables so we cannot use names that conflict
 // with the engineering system parameter names.
 
+//-------------------------- Globals ---------------------------------//
+
+def validTestFolders = [
+    'Benchstones',
+    'BenchmarksGame',
+    'Bytemark',
+    'Math',
+    'Span',
+    'first half',
+    'last half'
+    ]
+
 //--------------------- Windows Functions ----------------------------//
 
 def windowsBuild(String arch, String config, String pgo, boolean isBaseline) {
@@ -19,13 +31,15 @@ def windowsBuild(String arch, String config, String pgo, boolean isBaseline) {
     }
 
     bat "set __TestIntermediateDir=int&&.\\build.cmd -${config} -${arch} -skipbuildpackages ${pgoBuildFlag}"
+    bat "tests\\runtest.cmd ${config} ${arch} GenerateLayoutOnly"
+    bat "rd /s /q bin\\obj"
 
     // Stash build artifacts. Stash tests in an additional stash to be used by Linux test runs
     stash name: "nt-${arch}-${pgo}${baselineString}-build-artifacts", includes: 'bin/**'
     stash name: "nt-${arch}-${pgo}${baselineString}-test-artifacts", includes: 'bin/tests/**'
 }
 
-def windowsPerf(String arch, String config, String uploadString, String runType, String opt_level, String jit, String pgo, String scenario, boolean isBaseline, boolean isProfileOn) {
+def windowsPerf(String arch, String config, String uploadString, String runType, String opt_level, String jit, String pgo, String scenario, boolean isBaseline, boolean isProfileOn, String testFolder) {
     withCredentials([string(credentialsId: 'CoreCLR Perf BenchView Sas', variable: 'BV_UPLOAD_SAS_TOKEN')]) {
         checkout scm
         String baselineString = ""
@@ -33,11 +47,16 @@ def windowsPerf(String arch, String config, String uploadString, String runType,
             baselineString = "-baseline"
         }
         dir ('.') {
-            unstash "nt-${arch}-${pgo}${baselineString}-build-artifacts"
+            unstash "nt-${arch}-${pgo}${baselineString}-test-artifacts"
             unstash "benchview-tools"
             unstash "metadata"
         }
 
+        String test = ''
+        if (testFolder != 'all') {
+            test = testFolder
+        }
+
         String pgoTestFlag = ((pgo == 'nopgo') ? '-nopgo' : '')
 
         // We want to use the baseline metadata for baseline runs. We expect to find the submission metadata in
@@ -52,8 +71,6 @@ def windowsPerf(String arch, String config, String uploadString, String runType,
 
         bat "py \".\\Microsoft.BenchView.JSONFormat\\tools\\machinedata.py\""
         bat ".\\init-tools.cmd"
-        bat "run.cmd build -Project=\"tests\\build.proj\" -BuildOS=Windows_NT -BuildType=${config} -BuildArch=${arch} -BatchRestorePackages"
-        bat "tests\\runtest.cmd ${config} ${arch} GenerateLayoutOnly"
 
         // We run run-xunit-perf differently for each of the different job types
 
@@ -62,13 +79,43 @@ def windowsPerf(String arch, String config, String uploadString, String runType,
         String runXUnitCommonArgs = "-arch ${arch} -configuration ${config} -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} ${pgoTestFlag} -runtype ${runType} ${testEnv} -optLevel ${opt_level} -jitName ${jit} -outputdir \"%WORKSPACE%\\bin\\sandbox_logs\""
         if (scenario == 'perf') {
             String runXUnitPerfCommonArgs = "${runXUnitCommonArgs} -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH /AFFINITY 0x2\""
-            String runXUnitPerflabArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\perflab\\Perflab -library"
+            if (test == 'first half' || testFolder == 'all')
+            {
+                String runXUnitPerflabArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\performance\\perflab\\Perflab -library"
 
-            profileArg = isProfileOn ? "default+${profileArg}+gcapi" : profileArg
-            bat "tests\\scripts\\run-xunit-perf.cmd ${runXUnitPerflabArgs} -collectionFlags ${profileArg}"
+                profileArg = isProfileOn ? "default+${profileArg}+gcapi" : profileArg
+                bat "tests\\scripts\\run-xunit-perf.cmd ${runXUnitPerflabArgs} -collectionFlags ${profileArg}"
+            }
 
-            String runXUnitCodeQualityArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\Jit\\Performance\\CodeQuality"
-            bat "tests\\scripts\\run-xunit-perf.cmd ${runXUnitCodeQualityArgs} -collectionFlags ${profileArg}"
+            if (test == 'first half') {
+
+                [
+                    'Burgers',
+                    'Devirtualization',
+                    'FractalPerf',
+                    'Inlining',
+                    'Layout'
+                ].each { benchmark ->
+                    String runXUnitCodeQualityArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\Jit\\Performance\\CodeQuality\\${benchmark}"
+                    bat "tests\\scripts\\run-xunit-perf.cmd ${runXUnitCodeQualityArgs} -collectionFlags ${profileArg}"
+                }
+            }
+            else if (test == 'last half') {
+                [
+                    'Linq',
+                    'Roslyn',
+                    'SciMark',
+                    'Serialization',
+                    'V8'
+                ].each { benchmark ->
+                    String runXUnitCodeQualityArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\Jit\\Performance\\CodeQuality\\${benchmark}"
+                    bat "tests\\scripts\\run-xunit-perf.cmd ${runXUnitCodeQualityArgs} -collectionFlags ${profileArg}"
+                }
+            }
+            else {
+                String runXUnitCodeQualityArgs = "${runXUnitPerfCommonArgs} -testBinLoc bin\\tests\\${os}.${arch}.${config}\\Jit\\Performance\\CodeQuality\\${test}"
+                bat "tests\\scripts\\run-xunit-perf.cmd ${runXUnitCodeQualityArgs} -collectionFlags ${profileArg}"
+            }
         }
         else if (scenario == 'jitbench') {
             String runXUnitPerfCommonArgs = "${runXUnitCommonArgs} -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH\" -scenarioTest"
@@ -307,14 +354,16 @@ def innerLoopTests = [:]
 ['x64', 'x86'].each { arch ->
     ['full_opt'].each { opt_level ->
         [false].each { isBaseline ->
-            String baseline = ""
-            if (isBaseline) {
-                baseline = " baseline"
-            }
-            if (isPR() || !isBaseline) {
-                innerLoopTests["windows ${arch} ryujit ${opt_level} pgo${baseline} perf"] = {
-                    simpleNode('windows_server_2016_clr_perf', 180) {
-                        windowsPerf(arch, config, uploadString, runType, opt_level, 'ryujit', 'pgo', 'perf', isBaseline, true)
+            validTestFolders.each { benchmark ->
+                String baseline = ""
+                if (isBaseline) {
+                    baseline = " baseline"
+                }
+                if (isPR() || !isBaseline) {
+                    innerLoopTests["windows ${arch} ryujit ${opt_level} pgo ${benchmark}${baseline} perf"] = {
+                        simpleNode('windows_server_2016_clr_perf', 180) {
+                            windowsPerf(arch, config, uploadString, runType, opt_level, 'ryujit', 'pgo', 'perf', isBaseline, true, benchmark)
+                        }
                     }
                 }
             }
@@ -328,13 +377,13 @@ def outerLoopTests = [:]
 if (!isPR()) {
     outerLoopTests["windows ${arch} ryujit full_opt pgo${baseline} jitbench"] = {
         simpleNode('windows_server_2016_clr_perf', 180) {
-            windowsPerf(arch, config, uploadString, runType, 'full_opt', 'ryujit', 'pgo', 'jitbench', false)
+            windowsPerf(arch, config, uploadString, runType, 'full_opt', 'ryujit', 'pgo', 'jitbench', false, false, '')
         }
     }
 
     outerLoopTests["windows ${arch} ryujit full_opt pgo${baseline} illink"] = {
         simpleNode('Windows_NT', '20170427-elevated') {
-            windowsPerf(arch, config, uploadString, runType, 'full_opt', 'ryujit', 'pgo', 'illink', false)
+            windowsPerf(arch, config, uploadString, runType, 'full_opt', 'ryujit', 'pgo', 'illink', false, false, '')
         }
     }
 
@@ -345,7 +394,7 @@ if (!isPR()) {
                     [true, false].each { isProfileOn ->
                         outerLoopTests["windows ${arch} ${jit} ${opt_level} ${pgo_enabled} perf"] = {
                             simpleNode('windows_server_2016_clr_perf', 180) {
-                                windowsPerf(arch, config, uploadString, runType, opt_level, jit, pgo_enabled, 'perf', false, isProfileOn)
+                                windowsPerf(arch, config, uploadString, runType, opt_level, jit, pgo_enabled, 'perf', false, isProfileOn, 'all')
                             }
                         }
 
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Adams/Adams.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMk2/BenchMk2.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/BenchMrk/BenchMrk.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Bisect/Bisect.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/DMath/DMath.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/FFT/FFT.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InProd/InProd.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/InvMt/InvMt.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/LLoops.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/THIRD-PARTY-NOTICES
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/THIRD-PARTY-NOTICES
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/LLoops/THIRD-PARTY-NOTICES
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Lorenz/Lorenz.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/MatInv4/MatInv4.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtE/NewtE.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/NewtR/NewtR.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Regula/Regula.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Romber/Romber.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Secant/Secant.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Simpsn/Simpsn.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/SqMtx/SqMtx.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Trap/Trap.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchF/Whetsto/Whetsto.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/8Queens/8Queens.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Ackermann/Ackermann.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray/AddArray.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/AddArray2/AddArray2.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array1/Array1.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Array2/Array2.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BenchE/BenchE.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort/BubbleSort.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/BubbleSort2/BubbleSort2.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/CSieve/CSieve.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Fib/Fib.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/HeapSort/HeapSort.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/IniArray/IniArray.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/LogicArray/LogicArray.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Midpoint/Midpoint.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/MulMatrix/MulMatrix.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/NDhrystone/NDhrystone.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Permutate/Permutate.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Pi/Pi.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/Puzzle/Puzzle.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/QuickSort/QuickSort.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeInsert/TreeInsert.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/TreeSort/TreeSort.csproj
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.cs b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.cs
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.cs
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj
similarity index 100%
rename from tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj
rename to tests/src/JIT/Performance/CodeQuality/Benchstones/BenchI/XposMatrix/XposMatrix.csproj