Skip to content

Improve R2RTest compile-serp #37520

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

Merged
nattress merged 1 commit into from
Jun 8, 2020
Merged

Improve R2RTest compile-serp #37520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/coreclr/src/tools/r2rtest/BuildOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public class BuildOptions
public bool Release { get; set; }
public bool LargeBubble { get; set; }
public bool Composite { get; set; }
public bool PartialComposite { get; set; }
public int Crossgen2Parallelism { get; set; }
public int CompilationTimeoutMinutes { get; set; }
public int ExecutionTimeoutMinutes { get; set; }
Expand All @@ -42,6 +41,7 @@ public class BuildOptions
public DirectoryInfo[] RewriteOldPath { get; set; }
public DirectoryInfo[] RewriteNewPath { get; set; }
public DirectoryInfo AspNetPath { get; set; }
public SerpCompositeScenario CompositeScenario { get; set; }
public bool MeasurePerf { get; set; }
public string InputFileSearchString { get; set; }
public string ConfigurationSuffix => (Release ? "-ret.out" : "-chk.out");
Expand Down Expand Up @@ -117,7 +117,7 @@ public IEnumerable<CompilerRunner> CompilerRunners(bool isFramework, IEnumerable
List<string> cpaotReferencePaths = new List<string>();
cpaotReferencePaths.Add(CoreRootOutputPath(CompilerIndex.CPAOT, isFramework));
cpaotReferencePaths.AddRange(overrideReferencePaths != null ? overrideReferencePaths : ReferencePaths());
runners.Add(new CpaotRunner(this, cpaotReferencePaths));
runners.Add(new Crossgen2Runner(this, crossgen2RunnerOptions: null, cpaotReferencePaths));
}

if (Crossgen)
Expand Down
14 changes: 8 additions & 6 deletions src/coreclr/src/tools/r2rtest/CommandLineOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ Command CompileSerp() =>
new Option[]
{
InputDirectory(),
OutputDirectory(),
DegreeOfParallelism(),
AspNetPath(),
Composite(),
PartialComposite(),
CompositeScenario()
},
CompileSerpCommand.CompileSerpAssemblies);
options =>
{
var compileSerp = new CompileSerpCommand(options);
return compileSerp.CompileSerpAssemblies();
});

// Todo: Input / Output directories should be required arguments to the command when they're made available to handlers
// https://github.com/dotnet/command-line-api/issues/297
Expand Down Expand Up @@ -259,8 +261,8 @@ Option PackageList() =>
Option AspNetPath() =>
new Option<DirectoryInfo>(new[] { "--asp-net-path", "-asp" }, "Path to SERP's ASP.NET Core folder").ExistingOnly();

Option PartialComposite() =>
new Option<bool>(new[] { "--partial-composite", "-pc" }, "Add references to framework and asp.net instead of unrooted inputs");
Option CompositeScenario() =>
new Option<SerpCompositeScenario>(new [] { "--composite-scenario", "-cs" }, "Specifies which layers of a shared framework application are compiled as composite" );
}
}
}
Loading