From 11ca214e322ad804caceb1bd679b92b3ebf0e9e5 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Mon, 14 Sep 2020 16:45:41 -0700 Subject: [PATCH 1/3] Append random id to log files --- src/jit-dasm-pmi/jit-dasm-pmi.cs | 6 +++++- src/jit-dasm/jit-dasm.cs | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/jit-dasm-pmi/jit-dasm-pmi.cs b/src/jit-dasm-pmi/jit-dasm-pmi.cs index 4cce9853..ce28dbbc 100644 --- a/src/jit-dasm-pmi/jit-dasm-pmi.cs +++ b/src/jit-dasm-pmi/jit-dasm-pmi.cs @@ -359,6 +359,7 @@ private class DisasmEnginePmi public bool doDebugDump = false; public bool verbose = false; private int _errorCount = 0; + private Random _rand = new Random(); public int ErrorCount { get { return _errorCount; } } @@ -573,7 +574,10 @@ void AppendEnvironmentVariableToPmiEnv(string varName, string varValue) // Generate path to the output file var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); var dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); - var logPath = Path.ChangeExtension(dasmPath, ".log"); + + // Append a random id to the log files so they don't get picked up by "git diff" + string randomId = _rand.Next(0, 5000).ToString(); + var logPath = Path.ChangeExtension(dasmPath, $".{randomId}.log"); PathUtility.EnsureParentDirectoryExists(dasmPath); diff --git a/src/jit-dasm/jit-dasm.cs b/src/jit-dasm/jit-dasm.cs index 83c5b705..a498eee0 100644 --- a/src/jit-dasm/jit-dasm.cs +++ b/src/jit-dasm/jit-dasm.cs @@ -386,6 +386,7 @@ private abstract class DisasmEngine public bool verbose = false; private int _errorCount = 0; protected Dictionary _environmentVariables; + protected Random _rand = new Random(); public int ErrorCount { get { return _errorCount; } } @@ -544,7 +545,9 @@ public void GenerateAsm() if (_rootPath != null) { - var logPath = Path.ChangeExtension(dasmPath, ".log"); + // Append a random id to the log files so they don't get picked up by "git diff" + string randomId = _rand.Next(0, 5000).ToString(); + var logPath = Path.ChangeExtension(dasmPath, $".{randomId}.log"); // Redirect stdout/stderr to log file and run command. using (var outputStreamWriter = File.CreateText(logPath)) From a1d216a7caeeb9f1c7143896373d9b936bf52966 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Tue, 15 Sep 2020 23:59:38 -0700 Subject: [PATCH 2/3] Create baselogs and difflogs folder --- src/jit-analyze/jit-analyze.cs | 2 +- src/jit-dasm-pmi/jit-dasm-pmi.cs | 8 ++++---- src/jit-dasm/jit-dasm.cs | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/jit-analyze/jit-analyze.cs b/src/jit-analyze/jit-analyze.cs index 97b96415..ca6cd596 100644 --- a/src/jit-analyze/jit-analyze.cs +++ b/src/jit-analyze/jit-analyze.cs @@ -955,7 +955,7 @@ class ScriptResolverPolicyWrapper : ICommandResolverPolicy // There are files with diffs. Build up a dictionary mapping base file name to net text diff count. // Use "git diff" to do the analysis for us, then parse that output. // - // "git diff --no-index --exit-code --numstat" output shows added/deleted lines: + // "git diff --no-index --diff-filter=M --exit-code --numstat" output shows added/deleted lines: // // => // diff --git a/src/jit-dasm-pmi/jit-dasm-pmi.cs b/src/jit-dasm-pmi/jit-dasm-pmi.cs index ce28dbbc..0498ce10 100644 --- a/src/jit-dasm-pmi/jit-dasm-pmi.cs +++ b/src/jit-dasm-pmi/jit-dasm-pmi.cs @@ -359,7 +359,6 @@ private class DisasmEnginePmi public bool doDebugDump = false; public bool verbose = false; private int _errorCount = 0; - private Random _rand = new Random(); public int ErrorCount { get { return _errorCount; } } @@ -575,11 +574,12 @@ void AppendEnvironmentVariableToPmiEnv(string varName, string varValue) var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); var dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); - // Append a random id to the log files so they don't get picked up by "git diff" - string randomId = _rand.Next(0, 5000).ToString(); - var logPath = Path.ChangeExtension(dasmPath, $".{randomId}.log"); + // Create logs in seperate folder so they don't get picked up by "git diff" + var logPath = Path.Combine(Path.GetDirectoryName(dasmPath) + "logs", assemblyFileName); + logPath = Path.ChangeExtension(logPath, ".log"); PathUtility.EnsureParentDirectoryExists(dasmPath); + PathUtility.EnsureParentDirectoryExists(logPath); AppendEnvironmentVariableToPmiEnv("COMPlus_JitStdOutFile", dasmPath); diff --git a/src/jit-dasm/jit-dasm.cs b/src/jit-dasm/jit-dasm.cs index a498eee0..0f324f56 100644 --- a/src/jit-dasm/jit-dasm.cs +++ b/src/jit-dasm/jit-dasm.cs @@ -386,7 +386,6 @@ private abstract class DisasmEngine public bool verbose = false; private int _errorCount = 0; protected Dictionary _environmentVariables; - protected Random _rand = new Random(); public int ErrorCount { get { return _errorCount; } } @@ -513,13 +512,19 @@ public void GenerateAsm() } string dasmPath = null; + string logPath = null; if (_rootPath != null) { // Generate path to the output file var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); + // Create logs in seperate folder so they don't get picked up by "git diff" + logPath = Path.Combine(Path.GetDirectoryName(dasmPath) + "logs", assemblyFileName); + logPath = Path.ChangeExtension(logPath, ".log"); + PathUtility.EnsureParentDirectoryExists(dasmPath); + PathUtility.EnsureParentDirectoryExists(logPath); AddEnvironmentVariable("COMPlus_JitStdOutFile", dasmPath); } @@ -545,10 +550,6 @@ public void GenerateAsm() if (_rootPath != null) { - // Append a random id to the log files so they don't get picked up by "git diff" - string randomId = _rand.Next(0, 5000).ToString(); - var logPath = Path.ChangeExtension(dasmPath, $".{randomId}.log"); - // Redirect stdout/stderr to log file and run command. using (var outputStreamWriter = File.CreateText(logPath)) { From 0d7894513290d7059c63ad7d0e35d34c70efebde Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Wed, 16 Sep 2020 10:07:36 -0700 Subject: [PATCH 3/3] seperate -> separate --- src/cijobs/cijobs.cs | 2 +- src/jit-dasm-pmi/jit-dasm-pmi.cs | 2 +- src/jit-dasm/jit-dasm.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cijobs/cijobs.cs b/src/cijobs/cijobs.cs index fdda7851..772fd7ea 100755 --- a/src/cijobs/cijobs.cs +++ b/src/cijobs/cijobs.cs @@ -332,7 +332,7 @@ private static int Main(string[] args) } // Wrap CI httpClient with focused APIs for product, job, and build. - // This logic is seperate from listing/copying and just extracts data. + // This logic is separate from listing/copying and just extracts data. private class CIClient { private HttpClient _client; diff --git a/src/jit-dasm-pmi/jit-dasm-pmi.cs b/src/jit-dasm-pmi/jit-dasm-pmi.cs index 0498ce10..e93e26ab 100644 --- a/src/jit-dasm-pmi/jit-dasm-pmi.cs +++ b/src/jit-dasm-pmi/jit-dasm-pmi.cs @@ -574,7 +574,7 @@ void AppendEnvironmentVariableToPmiEnv(string varName, string varValue) var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); var dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); - // Create logs in seperate folder so they don't get picked up by "git diff" + // Create logs in separate folder so they don't get picked up by "git diff" var logPath = Path.Combine(Path.GetDirectoryName(dasmPath) + "logs", assemblyFileName); logPath = Path.ChangeExtension(logPath, ".log"); diff --git a/src/jit-dasm/jit-dasm.cs b/src/jit-dasm/jit-dasm.cs index 0f324f56..bbf23f91 100644 --- a/src/jit-dasm/jit-dasm.cs +++ b/src/jit-dasm/jit-dasm.cs @@ -10,7 +10,7 @@ // tools to validate ongoing development. // // Scenario 1: Pass A and B compilers to jitdasm. Using the --base and --diff -// arguments pass two seperate compilers and a passed set of assemblies. This +// arguments pass two separate compilers and a passed set of assemblies. This // is the most common scenario. // // Scenario 2: Iterativly call jitdasm with a series of compilers tagging @@ -519,7 +519,7 @@ public void GenerateAsm() var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); - // Create logs in seperate folder so they don't get picked up by "git diff" + // Create logs in separate folder so they don't get picked up by "git diff" logPath = Path.Combine(Path.GetDirectoryName(dasmPath) + "logs", assemblyFileName); logPath = Path.ChangeExtension(logPath, ".log");