Skip to content

[3.0] Add --only option to SilkTouch #2591

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
Exanite merged 4 commits into from
Jun 12, 2026
Merged

[3.0] Add --only option to SilkTouch #2591

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06c8f66
Start of only-option branch
Exanite Jun 12, 2026
9701b3d
Change SilkTouch entrypoint to use an actual Program class
Exanite Jun 12, 2026
febdf12
Add back the --only option
Exanite Jun 12, 2026
69a2a26
Merge branch 'develop/3.0' into feature/only-option
Exanite Jun 12, 2026
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
226 changes: 134 additions & 92 deletions sources/SilkTouch/SilkTouch/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,149 @@
using System;
using System.Collections.Concurrent;
using System.CommandLine;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using ClangSharp;
using Microsoft.Build.Locator;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Console;
using Silk.NET.SilkTouch;
using Silk.NET.SilkTouch.Caching;

var logging = new Option<LogLevel>(new[] { "--log-level", "-l" }, () => LogLevel.Information);
var skip = new Option<string[]>(
new[] { "--skip", "-s" },
Array.Empty<string>,
"A list of job names to skip."
)
{
Arity = ArgumentArity.ZeroOrMore,
};
var configs = new Argument<string[]>("configs", "Path(s) to JSON SilkTouch configuration(s)")
{
Arity = ArgumentArity.OneOrMore,
};
var configOverrides = new Argument<string[]>(
"overrides",
Array.Empty<string>,
"Arguments recognisable by Microsoft.Extensions.Configuration.CommandLine to override JSON configuration items."
)
{
Arity = ArgumentArity.ZeroOrMore,
};
var jobs = new Option<int>(
new[] { "--max-jobs", "-j" },
() => Environment.ProcessorCount,
"Maximum number of parallel ClangSharp executions."
);
var rootCommand = new RootCommand { logging, skip, configs, configOverrides, jobs };
rootCommand.SetHandler(async ctx =>
namespace Silk.NET.SilkTouch;

internal class Program
{
// Create the ConfigurationBuilder with support for env var & command line overrides
var cb = new ConfigurationBuilder()
.AddEnvironmentVariables(source => source.Prefix = "SILKDOTNET_")
.AddCommandLine(ctx.ParseResult.GetValueForArgument(configOverrides));

// Add the JSON files to the ConfigurationBuilder
var jsons = ctx.ParseResult.GetValueForArgument(configs);
cb = jsons.Aggregate(cb, (current, file) => current.AddJsonFile(Path.GetFullPath(file)));
var config = cb.Build();
if (jsons.Length == 1)
{
FileSystemCacheProvider.CommonDir = Path.GetFullPath(
(Path.GetDirectoryName(jsons[0]) is (null or not "") and var path ? path : ".")
?? Environment.CurrentDirectory
);
}
private static Option<LogLevel> LoggingOption { get; } =
new(["--log-level", "-l"], () => LogLevel.Information);

// Register MSBuild
MSBuildLocator.RegisterDefaults();
private static Option<string[]> SkipOption { get; } =
new(["--skip", "-s"], Array.Empty<string>)
{
Description = "A list of job names to skip. Takes precedence over --only.",
Arity = ArgumentArity.ZeroOrMore,
};

var sp = new ServiceCollection()
.AddLogging(builder =>
private static Option<string[]> OnlyOption { get; } =
new(new[] { "--only", "-o" }, Array.Empty<string>)
{
builder.AddSimpleConsole(opts =>
{
opts.SingleLine = true;
opts.ColorBehavior = Console.IsOutputRedirected
? LoggerColorBehavior.Disabled
: LoggerColorBehavior.Default;
opts.IncludeScopes = false;
});
builder.SetMinimumLevel(ctx.ParseResult.GetValueForOption(logging));
})
.AddOptions()
.AddSilkTouch(config)
.BuildServiceProvider();

var logger = sp.GetRequiredService<ILogger<Program>>();
var skipped = ctx.ParseResult.GetValueForOption(skip);
var generator = sp.GetRequiredService<SilkTouchGenerator>();
await Parallel.ForEachAsync(
config
.GetSection("Jobs")
.GetChildren()
.Where(x =>
skipped?.All(y => !x.Key.Equals(y, StringComparison.OrdinalIgnoreCase)) ?? true
),
async (job, ct) =>
Description = "A list of job names to run.",
Arity = ArgumentArity.ZeroOrMore,
};

private static Argument<string[]> ConfigsArgument { get; } =
new("configs")
{
Description = "Path(s) to JSON SilkTouch configuration(s)",
Arity = ArgumentArity.OneOrMore,
};

private static Argument<string[]> ConfigOverridesArgument { get; } =
new("overrides", Array.Empty<string>)
{
Description =
"Arguments recognisable by Microsoft.Extensions.Configuration.CommandLine to override JSON configuration items.",
Arity = ArgumentArity.ZeroOrMore,
};

private static Option<int> JobsOption { get; } =
new(new[] { "--max-jobs", "-j" }, () => Environment.ProcessorCount)
{
Description = "Maximum number of parallel ClangSharp executions.",
};

public static async Task Main(string[] args)
{
var rootCommand = new RootCommand
{
await generator.RunAsync(
job.Key,
job,
// TODO parallelism configuration
// ctx.ParseResult.GetValueForOption(jobs),
ct
LoggingOption,
SkipOption,
OnlyOption,
ConfigsArgument,
ConfigOverridesArgument,
JobsOption,
};

rootCommand.SetHandler(async ctx =>
{
// Create the ConfigurationBuilder with support for env var & command line overrides
var cb = new ConfigurationBuilder()
.AddEnvironmentVariables(source => source.Prefix = "SILKDOTNET_")
.AddCommandLine(ctx.ParseResult.GetValueForArgument(ConfigOverridesArgument));

// Add the JSON files to the ConfigurationBuilder
var jsons = ctx.ParseResult.GetValueForArgument(ConfigsArgument);
cb = jsons.Aggregate(
cb,
(current, file) => current.AddJsonFile(Path.GetFullPath(file))
);
var config = cb.Build();
if (jsons.Length == 1)
{
FileSystemCacheProvider.CommonDir = Path.GetFullPath(
(Path.GetDirectoryName(jsons[0]) is (null or not "") and var path ? path : ".")
?? Environment.CurrentDirectory
);
}

// Register MSBuild
MSBuildLocator.RegisterDefaults();

var sp = new ServiceCollection()
.AddLogging(builder =>
{
builder.AddSimpleConsole(opts =>
{
opts.SingleLine = true;
opts.ColorBehavior = Console.IsOutputRedirected
? LoggerColorBehavior.Disabled
: LoggerColorBehavior.Default;
opts.IncludeScopes = false;
});
builder.SetMinimumLevel(ctx.ParseResult.GetValueForOption(LoggingOption));
})
.AddOptions()
.AddSilkTouch(config)
.BuildServiceProvider();

var jobsToRun = new HashSet<string>(
ctx.ParseResult.GetValueForOption(OnlyOption) ?? [],
StringComparer.OrdinalIgnoreCase
);
}
);
// workaround for dangling logging/socket engine threads
Environment.Exit(0);
});

await rootCommand.InvokeAsync(args);
var jobsToSkip = new HashSet<string>(
ctx.ParseResult.GetValueForOption(SkipOption) ?? [],
StringComparer.OrdinalIgnoreCase
);

var logger = sp.GetRequiredService<ILogger<Program>>();
var generator = sp.GetRequiredService<SilkTouchGenerator>();

await Parallel.ForEachAsync(
config
.GetSection("Jobs")
.GetChildren()
.Where(section =>
{
if (jobsToSkip.Contains(section.Key))
{
return false;
}

return jobsToRun.Count == 0 || jobsToRun.Contains(section.Key);
}),
async (job, ct) =>
{
await generator.RunAsync(
job.Key,
job,
// TODO parallelism configuration
// ctx.ParseResult.GetValueForOption(jobs),
ct
);
}
);

// Workaround for dangling logging/socket engine threads
Environment.Exit(0);
});

await rootCommand.InvokeAsync(args);
}
}
Loading