diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpu2017ExecutorTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpu2017ExecutorTests.cs index f33e5e09e4..1ae1288174 100644 --- a/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpu2017ExecutorTests.cs +++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/SPEC/SpecCpu2017ExecutorTests.cs @@ -23,6 +23,7 @@ namespace VirtualClient.Actions using Newtonsoft.Json.Linq; using NUnit.Framework; using VirtualClient.Common; + using VirtualClient.Common.ProcessAffinity; [TestFixture] [Category("Unit")] @@ -699,7 +700,56 @@ public async Task SpecCpu2017ExecutorSelectsSymmetricNumaAffinity(int nodeCount, EventContext selection = (EventContext)this.mockFixture.Logger.Single(entry => entry.Item2.Name.EndsWith(".SymmetricAffinitySelected", StringComparison.Ordinal)).Item3; Assert.AreEqual(expectedCpus, selection.Properties["cpuIds"]); Assert.AreEqual(true, selection.Properties["pinningEnabled"]); - Assert.AreEqual(expectedCpus, ((IDictionary)selection.Properties["metadata_scenario"])["NumaProcessorAffinity"]); + Assert.AreEqual(expectedCoreSpec, ((IDictionary)selection.Properties["metadata_scenario"])["NumaProcessorAffinity"]); + } + + [TestCase(64, "0-31,64-95")] + [TestCase(40, "0-31,64-67,80-83")] + [TestCase(4, "0,1,16,17")] + public async Task SpecCpu2017ExecutorSelectsSymmetricNumaAffinityOnBifurcatedNodeCpuRanges(int copyCount, string expectedCoreSpec) + { + this.SetupLinux(Architecture.Arm64); + this.SetupInstalledAffinityRun(string.Empty); + this.mockFixture.Parameters[nameof(SpecCpuExecutor.EnableNumaProcessorAffinitySymmetric)] = true; + this.mockFixture.Parameters[nameof(SpecCpuExecutor.CopyCount)] = copyCount; + + // Each NUMA node owns two non-contiguous CPU ranges (e.g. node0 = 0-15 and 64-79). + IEnumerable node0 = Enumerable.Range(0, 16).Concat(Enumerable.Range(64, 16)); + IEnumerable node1 = Enumerable.Range(16, 16).Concat(Enumerable.Range(80, 16)); + string topology = "available: 2 nodes (0-1)\n" + + $"node 0 cpus: {string.Join(" ", node0)}\nnode 0 size: 16000 MB\nnode 0 free: 12000 MB\n" + + $"node 1 cpus: {string.Join(" ", node1)}\nnode 1 size: 16000 MB\nnode 1 free: 12000 MB"; + + string pinnedConfig = null; + this.mockFixture.File.Setup(f => f.WriteAllTextAsync(It.IsAny(), It.IsAny(), It.IsAny())) + .Callback((path, content, token) => pinnedConfig = content) + .Returns(Task.CompletedTask); + + List commands = new List(); + this.mockFixture.ProcessManager.OnCreateProcess = (exe, arguments, workingDir) => + { + commands.Add($"{exe} {arguments}"); + return new InMemoryProcess + { + StartInfo = new ProcessStartInfo { FileName = exe, Arguments = arguments }, + StandardOutput = new ConcurrentBuffer(new StringBuilder(exe == "numactl" && arguments == "--hardware" ? topology : string.Empty)), + ExitCode = 0, + OnStart = () => true, + OnHasExited = () => true + }; + }; + + using (TestSpecCpu2017Executor executor = new TestSpecCpu2017Executor(this.mockFixture.Dependencies, this.mockFixture.Parameters)) + { + await executor.ExecuteAsync(CancellationToken.None).ConfigureAwait(false); + } + + string expectedCpus = string.Join(",", ProcessAffinityConfiguration.ParseCoreList(expectedCoreSpec).OrderBy(cpu => cpu)); + StringAssert.Contains($"bind = {expectedCpus}", pinnedConfig); + Assert.IsTrue(commands.Any(command => command == $"numactl --localalloc -C {expectedCoreSpec} true")); + EventContext selection = (EventContext)this.mockFixture.Logger.Single(entry => entry.Item2.Name.EndsWith(".SymmetricAffinitySelected", StringComparison.Ordinal)).Item3; + Assert.AreEqual(expectedCpus, selection.Properties["cpuIds"]); + Assert.AreEqual(expectedCoreSpec, ((IDictionary)selection.Properties["metadata_scenario"])["NumaProcessorAffinity"]); } [Test] diff --git a/src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs b/src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs index ed8d029298..c3a653f551 100644 --- a/src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs +++ b/src/VirtualClient/VirtualClient.Actions/SPECcpu/SpecCpuExecutor.cs @@ -267,7 +267,8 @@ protected async Task ExecuteSpecCpuAsync(EventContext telemetryContext, Cancella this.Parameters[nameof(this.EnableNumaProcessorAffinitySymmetric)] = true; string affinity = await this.GetSymmetricNumaProcessorAffinityAsync(cancellationToken); this.Parameters[nameof(this.NumaProcessorAffinity)] = affinity; - this.MetadataContract.Add(nameof(this.NumaProcessorAffinity), affinity, MetadataContract.ScenarioCategory); + string affinityRanges = new LinuxProcessAffinityConfiguration(ProcessAffinityConfiguration.ParseCoreList(affinity)).NumactlCoreSpec; + this.MetadataContract.Add(nameof(this.NumaProcessorAffinity), affinityRanges, MetadataContract.ScenarioCategory); this.MetadataContract.Apply(telemetryContext); this.LogSpecCpuStep(telemetryContext, "SymmetricAffinitySelected", ("cpuIds", affinity)); }