Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Coreclr param #296

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Coreclr param #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e70a4f3
coreclr copying
Rattenkrieg Oct 31, 2020
d2aa83f
xplat coreclr name
Rattenkrieg Oct 31, 2020
b076273
fix copypaste
Rattenkrieg Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 31 additions & 41 deletions src/jit-diff/diff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,13 +612,15 @@ public class PmiDiffTool : DiffTool
string m_corerunPath;
string m_defaultJitName;
string m_testJitName;
string m_testCoreclrName;

public PmiDiffTool(Config config) : base(config)
{
m_name = "PMI";
m_commandName = s_asmToolJit;
m_corerunPath = Path.Combine(m_config.CoreRoot, GetCorerunExecutableName(m_config.PlatformMoniker));
m_defaultJitName = GetJitLibraryName(m_config.PlatformMoniker);
m_testCoreclrName = GetCoreClrLibraryName(m_config.PlatformMoniker);
if (m_config.AltJit != null)
{
m_testJitName = m_config.AltJit;
Expand Down Expand Up @@ -663,57 +665,45 @@ protected override List<string> ConstructArgs(List<string> commandArgs, string c
return dasmArgs;
}

void InstallBaseJit()
void InstallLibs(string libPath)
{
string existingJitPath = Path.Combine(m_config.CoreRoot, m_testJitName);
string backupJitPath = Path.Combine(m_config.CoreRoot, "backup-" + m_testJitName);
string testJitPath = Path.Combine(m_config.BasePath, m_testJitName);
if (File.Exists(existingJitPath))
var libs = new[] { ("jit", m_testJitName), ("coreclr", m_testCoreclrName) };
foreach (var (lib, libName) in libs)
{
if (m_config.Verbose)
string existingLibPath = Path.Combine(m_config.CoreRoot, libName);
string backupLibPath = Path.Combine(m_config.CoreRoot, "backup-" + libName);
string testLibPath = Path.Combine(libPath, libName);
if (File.Exists(existingLibPath))
{
Console.WriteLine($"Saving off existing jit: {existingJitPath} ==> {backupJitPath}");
if (m_config.Verbose)
{
Console.WriteLine($"Saving off existing {lib}: {existingLibPath} ==> {backupLibPath}");
}
File.Copy(existingLibPath, backupLibPath, true);
}
File.Copy(existingJitPath, backupJitPath, true);
}
if (m_config.Verbose)
{
Console.WriteLine($"Copying in the test jit: {testJitPath} ==> {existingJitPath}");
}
File.Copy(testJitPath, existingJitPath, true);
}

void InstallDiffJit()
{
string exitingJitPath = Path.Combine(m_config.CoreRoot, m_testJitName);
string backupJitPath = Path.Combine(m_config.CoreRoot, "backup-" + m_testJitName);
string testJitPath = Path.Combine(m_config.DiffPath, m_testJitName);
if (File.Exists(exitingJitPath))
{
if (m_config.Verbose)
{
Console.WriteLine($"Saving off existing jit: {exitingJitPath} ==> {backupJitPath}");
Console.WriteLine($"Copying in the test {lib}: {testLibPath} ==> {existingLibPath}");
}
File.Copy(exitingJitPath, backupJitPath, true);
}
if (m_config.Verbose)
{
Console.WriteLine($"Copying in the test jit: {testJitPath} ==> {exitingJitPath}");
File.Copy(testLibPath, existingLibPath, true);
}
File.Copy(testJitPath, exitingJitPath, true);
}

void RestoreDefaultJit()
void RestoreLibs()
{
string existingJitPath = Path.Combine(m_config.CoreRoot, m_testJitName);
string backupJitPath = Path.Combine(m_config.CoreRoot, "backup-" + m_testJitName);
if (File.Exists(backupJitPath))
var libs = new[] { ("jit", m_testJitName), ("coreclr", m_testCoreclrName) };
foreach (var (lib, libName) in libs)
{
if (m_config.Verbose)
string existingLibPath = Path.Combine(m_config.CoreRoot, libName);
string backupLibPath = Path.Combine(m_config.CoreRoot, "backup-" + libName);
if (File.Exists(backupLibPath))
{
Console.WriteLine($"Restoring existing jit: {backupJitPath} ==> {existingJitPath}");
if (m_config.Verbose)
{
Console.WriteLine($"Restoring existing {lib}: {backupLibPath} ==> {existingLibPath}");
}
File.Copy(backupLibPath, existingLibPath, true);
}
File.Copy(backupJitPath, existingJitPath, true);
}
}

Expand All @@ -727,7 +717,7 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
{
try
{
InstallBaseJit();
InstallLibs(m_config.BasePath);
foreach (var assemblyInfo in assemblyWorkList)
{
StartDasmWorkOne(DasmWorkKind.Base, commandArgs, "base", m_config.BasePath, assemblyInfo);
Expand All @@ -737,15 +727,15 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
}
finally
{
RestoreDefaultJit();
RestoreLibs();
}
}

if (m_config.DoDiffCompiles)
{
try
{
InstallDiffJit();
InstallLibs(m_config.DiffPath);
foreach (var assemblyInfo in assemblyWorkList)
{
StartDasmWorkOne(DasmWorkKind.Diff, commandArgs, "diff", m_config.DiffPath, assemblyInfo);
Expand All @@ -755,7 +745,7 @@ protected override void StartDasmWorkBaseDiff(List<string> commandArgs, List<Ass
}
finally
{
RestoreDefaultJit();
RestoreLibs();
}
}
}
Expand Down
16 changes: 16 additions & 0 deletions src/jit-diff/jit-diff.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ private static string GetJitLibraryName(string platformMoniker)
}
}

private static string GetCoreClrLibraryName(string platformMoniker)
{
switch (platformMoniker)
{
case "Windows":
return "coreclr.dll";
case "Linux":
return "libcoreclr.so";
case "OSX":
return "libcoreclr.dylib";
default:
Console.Error.WriteLine("No platform mapping! (Platform moniker = {0})", platformMoniker);
return null;
}
}

private static string GetCrossgenExecutableName(string platformMoniker)
{
switch (platformMoniker)
Expand Down