Current values for JitVersion, Platform, and Framework

dotnet · May 6, 2015 · 295cc26 · 295cc26
1 parent ce7f58d
commit 295cc26
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 13 deletions.
diff --git a/BenchmarkDotNet/Attributes/TaskAttribute.cs b/BenchmarkDotNet/Attributes/TaskAttribute.cs
@@ -11,8 +11,8 @@ public class TaskAttribute : Attribute
         public TaskAttribute(
             int runCount = 1,
             BenchmarkMode mode = BenchmarkMode.SingleRun,
-            BenchmarkPlatform platform = BenchmarkPlatform.AnyCpu,
-            BenchmarkJitVersion jitVersion = BenchmarkJitVersion.LegacyJit,
+            BenchmarkPlatform platform = BenchmarkPlatform.CurrentPlatform,
+            BenchmarkJitVersion jitVersion = BenchmarkJitVersion.CurrentJit,
             BenchmarkFramework framework = BenchmarkFramework.V40,
             int warmupIterationCount = 5,
             int targetIterationCount = 10

diff --git a/BenchmarkDotNet/BenchmarkProjectGenerator.cs b/BenchmarkDotNet/BenchmarkProjectGenerator.cs
@@ -119,7 +119,8 @@ private static void SaveProjectFile(string projectDir, BenchmarkConfiguration co
         private static void SaveAppConfigFile(string projectDir, BenchmarkConfiguration configuration)
         {
             string appConfigPath = Path.Combine(projectDir, "app.config");
-            File.WriteAllText(appConfigPath, GetAppConfig(configuration.JitVersion.ToConfig()));
+            var content = configuration.JitVersion == BenchmarkJitVersion.CurrentJit ? GetEmptyAppConfig() : GetAppConfig(configuration.JitVersion.ToConfig());
+            File.WriteAllText(appConfigPath, content);
         }
 
         private static string CreateProjectDirectory(Benchmark benchmark)
@@ -206,6 +207,16 @@ private static string GetAppConfig(string useLegacyJit)
             return appConfigTemplate.Replace("$USELEGACYJIT$", useLegacyJit);
         }
 
+
+        private static string GetEmptyAppConfig()
+        {
+            const string appConfigTemplate = @"<?xml version=""1.0""?>
+<configuration>
+</configuration>
+";
+            return appConfigTemplate;
+        }
+
         #endregion
     }
 }
diff --git a/BenchmarkDotNet/BenchmarkRunner.cs b/BenchmarkDotNet/BenchmarkRunner.cs
@@ -54,7 +54,7 @@ public IEnumerable<BenchmarkReport> RunCompetition(List<Benchmark> benchmarks)
             }
             Logger.WriteLineHeader("// ***** Competition: Finish  *****");
             Logger.NewLine();
-            Logger.WriteLineInfo(EnvironmentHelper.GetFullEnvironmentInfo(false));
+            Logger.WriteLineInfo(EnvironmentHelper.GetFullEnvironmentInfo());
             var reportStats = reports.Select(
                 r => new
                 {

diff --git a/BenchmarkDotNet/EnvironmentHelper.cs b/BenchmarkDotNet/EnvironmentHelper.cs
@@ -45,16 +45,13 @@ private static string GetJitFlag()
             return "";
         }
 
-        public static string GetFullEnvironmentInfo(bool includeClr = true)
+        public static string GetFullEnvironmentInfo()
         {
             var line1 = $"// BenchmarkDotNet=v{GetBenchmarkDotNetVersion()}";
             var line2 = $"// OS={GetOsVersion()}";
             var line3 = $"// Processor={GetProcessorName()}, ProcessorCount={GetProcessorCount()}";
             var line4 = $"// CLR={GetClrVersion()}, Arch={GetArch()} {GetConfiguration()}{GetDebuggerFlag()}{GetJitFlag()}";
-            var lines = new List<string> { line1, line2, line3 };
-            if (includeClr)
-                lines.Add(line4);
-            return string.Join(Environment.NewLine, lines.ToArray());
+            return string.Join(Environment.NewLine, new[] { line1, line2, line3, line4 });
         }
 
         private static string GetBenchmarkDotNetVersion()

diff --git a/BenchmarkDotNet/Extensions/ConfigurationExtensions.cs b/BenchmarkDotNet/Extensions/ConfigurationExtensions.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+using System;
+using System.Linq;
+using System.Reflection;
 using BenchmarkDotNet.Tasks;
 
 namespace BenchmarkDotNet.Extensions
@@ -15,18 +17,36 @@ public static string ToConfig(this BenchmarkPlatform platform)
                     return "x86";
                 case BenchmarkPlatform.X64:
                     return "x64";
+                case BenchmarkPlatform.CurrentPlatform:
+                    return IntPtr.Size == 4 ? "x86" : "x64";
                 default:
                     return "AnyCPU";
             }
         }
 
         public static string ToConfig(this BenchmarkFramework framework)
         {
+            if (framework == BenchmarkFramework.Current)
+                return DetectCurrentFramework();
             var number = framework.ToString().Substring(1);
             var numberArray = number.ToCharArray().Select(c => c.ToString()).ToArray();
             return "v" + string.Join(".", numberArray);
         }
 
+        private static string DetectCurrentFramework()
+        {
+            var attribute = Assembly.GetExecutingAssembly().GetCustomAttributes(false).
+             OfType<Attribute>().FirstOrDefault(a => a.ToString() == @"System.Runtime.Versioning.TargetFrameworkAttribute");
+            if (attribute == null)
+                return "v3.5";
+            var frameworkName = attribute.GetType()
+                .GetProperty("FrameworkName", BindingFlags.Public | BindingFlags.Instance)
+                .GetValue(attribute, null)?.ToString();
+            if (frameworkName != null)
+                frameworkName = frameworkName.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries).Skip(1).FirstOrDefault() ?? "";
+            return frameworkName;
+        }
+
         public static string ToConfig(this BenchmarkJitVersion jitVersion)
         {
             return jitVersion == BenchmarkJitVersion.LegacyJit ? "1" : "0";

diff --git a/BenchmarkDotNet/Tasks/BenchmarkFramework.cs b/BenchmarkDotNet/Tasks/BenchmarkFramework.cs
@@ -2,6 +2,6 @@
 {
     public enum BenchmarkFramework
     {
-        V35, V40, V45, V451, V452, V46
+        Current, V35, V40, V45, V451, V452, V46
     }
 }
diff --git a/BenchmarkDotNet/Tasks/BenchmarkJitVersion.cs b/BenchmarkDotNet/Tasks/BenchmarkJitVersion.cs
@@ -2,6 +2,6 @@
 {
     public enum BenchmarkJitVersion
     {
-         LegacyJit, RyuJit
+        CurrentJit, LegacyJit, RyuJit
     }
 }
diff --git a/BenchmarkDotNet/Tasks/BenchmarkPlatform.cs b/BenchmarkDotNet/Tasks/BenchmarkPlatform.cs
@@ -2,6 +2,6 @@
 {
     public enum BenchmarkPlatform
     {
-         AnyCpu, X86, X64
+        CurrentPlatform, AnyCpu, X86, X64
     }
 }