Merge pull request #5 from unity/JsonParserUpdate

Update PBR to support Json format performance test run files

Author: amaestas13

UnityPerformanceBenchmarkReporter/ESupportedFileTypes.cs

@@ -0,0 +1,8 @@
+namespace UnityPerformanceBenchmarkReporter.Entities
+{
+    public enum ESupportedFileTypes
+    {
+        json,
+        xml
+    }
+}

UnityPerformanceBenchmarkReporter/Entities/Data.cs

@@ -18,6 +18,7 @@ public class SampleGroup
         public string Name;
         public SampleUnit Unit;
         public bool IncreaseIsBetter;
+        public double Threshold = 0.15;
         public List<double> Samples = new List<double>();
         public double Min;
         public double Max;
@@ -65,6 +66,9 @@ public class Hardware
         public int ProcessorCount;
         public string GraphicsDeviceName;
         public int SystemMemorySizeMB;
+
+        public string XrModel ;
+        public string XrDevice;
     }
 
     [Serializable]

UnityPerformanceBenchmarkReporter/Entities/PerformanceTestRun.cs

@@ -12,10 +12,25 @@ public class PerformanceTestRun
         public ScreenSettings ScreenSettings;
         public QualitySettings QualitySettings;
         public PlayerSettings PlayerSettings;
+        public ProjectVersion ProjectVersion;
+
+        public string TestProject;
         public string TestSuite;
         public double StartTime;
         public double EndTime;
         public List<PerformanceTestResult> Results  = new List<PerformanceTestResult>();
+
+        public JobMetaData JobMetaData ;
+        public object Dependencies;
+    }
+
+    [Serializable]    
+        public class ProjectVersion
+    {
+        public string ProjectName { get; set; }
+        public string Branch { get; set; }
+        public string Changeset { get; set; }
+        public DateTime Date { get; set; }
     }
 
     [Serializable]
@@ -73,19 +88,40 @@ public class QualitySettings
     public class PlayerSettings
     {
         public string ScriptingBackend;
-        public string ScriptingRuntimeVersion;
         public bool VrSupported;
         public bool MtRendering;
         public bool GraphicsJobs;
         public bool GpuSkinning;
         public string GraphicsApi;
-        //public string Batchmode; TODO
+        public string Batchmode; 
         //public int StaticBatching; TODO
         //public int DynamicBatching; TODO
         public string StereoRenderingPath;
         public string RenderThreadingMode;
         public string AndroidMinimumSdkVersion;
         public string AndroidTargetSdkVersion;
         public List<string> EnabledXrTargets;
+
+        public string ScriptingRuntimeVersion;
+    }
+    
+
+    [Serializable]
+     public class Yamato
+    {
+        public string JobFriendlyName { get; set; }
+        public string JobName { get; set; }
+        public string JobId { get; set; }
+        public string ProjectId { get; set; }
+        public string ProjectName { get; set; }
+        public object WorkDir { get; set; }
+        public object JobOwnerEmail { get; set; }
+    }
+
+    [Serializable]
+    public class JobMetaData
+    {
+        public Yamato Yamato { get; set; }
+        public object Bokken { get; set; }
     }
 }

UnityPerformanceBenchmarkReporter/Entities/SampleGroup.cs

@@ -28,6 +28,8 @@ public class SampleGroupDefinition
         public double Threshold;
         public bool IncreaseIsBetter;
         public double Percentile;
+
+        public bool FailOnBaseline;
     }
 
     public enum AggregationType

UnityPerformanceBenchmarkReporter/Entities/SampleGroupResult.cs

@@ -12,6 +12,7 @@ public class SampleGroupResult
         public string AggregationType;
         public double Percentile;
         public bool Regressed;
+        public bool Progressed;
         public double Min;
         public double Max;
         public double Median;

UnityPerformanceBenchmarkReporter/IParser.cs

@@ -0,0 +1,9 @@
+using UnityPerformanceBenchmarkReporter.Entities;
+
+namespace UnityPerformanceBenchmarkReporter
+{
+    public interface IParser
+    {
+        public PerformanceTestRun Parse(string path,int version);
+    }
+}

UnityPerformanceBenchmarkReporter/OptionsParser.cs

@@ -41,7 +41,7 @@ public void ParseOptions(PerformanceBenchmark performanceBenchmark, IEnumerable<
                     ShowHelp(string.Empty, os);
                 }
 
-                if (!performanceBenchmark.ResultXmlFilePaths.Any() && !performanceBenchmark.ResultXmlDirectoryPaths.Any())
+                if (!performanceBenchmark.ResultFilePaths.Any() && !performanceBenchmark.ResultDirectoryPaths.Any())
                 {
                     ShowHelp("Missing required option --results=(filePath|directoryPath)", os);
                 }
@@ -61,20 +61,22 @@ public void ParseOptions(PerformanceBenchmark performanceBenchmark, IEnumerable<
         private OptionSet GetOptions(PerformanceBenchmark performanceBenchmark)
         {
             var optionsSet = new OptionSet();
-                optionsSet.Add("?|help|h", "Prints out the options.", option => help = option != null);
-                optionsSet.Add(
-                        "results|testresultsxmlsource=", 
-                        "REQUIRED - Path to a test result XML filename OR directory. Directories are searched resursively. You can repeat this option with multiple result file or directory paths.",
-                    xmlsource => performanceBenchmark.AddXmlSourcePath(xmlsource, "results", ResultType.Test));
-                optionsSet.Add(
-                        "baseline|baselinexmlsource:", "OPTIONAL - Path to a baseline XML filename.",
-                        xmlsource => performanceBenchmark.AddXmlSourcePath(xmlsource, "baseline", ResultType.Baseline));
-                optionsSet.Add(
-                        "report|reportdirpath:", "OPTIONAL - Path to where the report will be written. Default is current working directory.",
-                        performanceBenchmark.AddReportDirPath);
-                optionsSet.Add("failonbaseline",
-                    "Enable return '1' by the reporter if a baseline is passed in and one or more matching configs is out of threshold. Disabled is default. Use option to enable, or use option and append '-' to explicitly disable.",
-                    option => performanceBenchmark.FailOnBaseline = option != null);
+            optionsSet.Add("?|help|h", "Prints out the options.", option => help = option != null);
+            optionsSet.Add("dataversion|version=", "Sets Expected Perf Data Version for Results and Baseline Files (1 = V1 2 = V2). Versions of Unity Perf Framework 2.0 or newer will use the V2 data format. If no arg is provided we assume the format is V2", version => performanceBenchmark.SetDataVersion(version));
+            optionsSet.Add("fileformat|format=", "Sets Expected File Format for Results and Baseline Files. If no arg is provided we assume the format is XML", filtype => performanceBenchmark.SetFileType(filtype));
+            optionsSet.Add(
+                    "results|testresultsxmlsource=",
+                    "REQUIRED - Path to a test result XML filename OR directory. Directories are searched resursively. You can repeat this option with multiple result file or directory paths.",
+                xmlsource => performanceBenchmark.AddSourcePath(xmlsource, "results", ResultType.Test));
+            optionsSet.Add(
+                    "baseline|baselinexmlsource:", "OPTIONAL - Path to a baseline XML filename.",
+                    xmlsource => performanceBenchmark.AddSourcePath(xmlsource, "baseline", ResultType.Baseline));
+            optionsSet.Add(
+                    "report|reportdirpath:", "OPTIONAL - Path to where the report will be written. Default is current working directory.",
+                    performanceBenchmark.AddReportDirPath);
+            optionsSet.Add("failonbaseline",
+                "Enable return '1' by the reporter if a baseline is passed in and one or more matching configs is out of threshold. Disabled is default. Use option to enable, or use option and append '-' to explicitly disable.",
+                option => performanceBenchmark.FailOnBaseline = option != null);
             return optionsSet;
         }