Merge pull request #4 from thakyuu/master

SMT Off Support
thakyuu · Nov 27, 2020 · 9c97e70 · 9c97e70
2 parents 71c1621 + 40c6bf0
commit 9c97e70
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 11 deletions.
diff --git a/.idea/.idea.VrcAffinitySetter/.idea/workspace.xml b/.idea/.idea.VrcAffinitySetter/.idea/workspace.xml
diff --git a/VrcAffinitySetter/VrcAffinitySetter.cs b/VrcAffinitySetter/VrcAffinitySetter.cs
@@ -18,7 +18,6 @@ private static void SetAffinity(string processName,IntPtr affinity)
 			}
 
 			var targetProcess = targetProcesses[0];
-
 			Console.WriteLine($"{processName} Detected!");
 			targetProcess.ProcessorAffinity = affinity;
 			Console.WriteLine($"{processName} Affinity Change Complete!");
@@ -35,7 +34,8 @@ public static void Main(string[] args)
 
 			var processorName = key.GetValue("ProcessorNameString").ToString();
 			Console.WriteLine($"Current Processor > {processorName}");
-
+			Console.WriteLine($"Current Enable Thread > {Environment.ProcessorCount}");
+
 			var affinity = (IntPtr) 1;
 
 			if (!Regex.IsMatch(processorName, @" Ryzen", RegexOptions.Singleline))
@@ -45,27 +45,70 @@ public static void Main(string[] args)
 			}else if (Regex.IsMatch(processorName, @" [123]600(X|XT|AF)?", RegexOptions.Singleline))
 			{
 				// 6C/12T(3C/CCX)
-				affinity = (IntPtr) 0x0FC0;
+				if (Environment.ProcessorCount == 12)
+				{
+					affinity = (IntPtr) 0x0FC0;
+				}
+				else
+				{
+					affinity = (IntPtr) 0x0038;
+				}
 			}else if (Regex.IsMatch(processorName, @" [123][78]00(X|XT)?", RegexOptions.Singleline))
 			{
 				// 8C/16T(4C/CCX)
-				affinity = (IntPtr) 0xFF00;
+				if (Environment.ProcessorCount == 16)
+				{
+					affinity = (IntPtr) 0xFF00;
+				}
+				else
+				{
+					affinity = (IntPtr) 0x00F0;
+				}
 			}else if (Regex.IsMatch(processorName, @" 3900(X|XT)?", RegexOptions.Singleline))
 			{
 				// 12C/24T(3C/CCX)
-				affinity = (IntPtr) 0x00FC0000;
+				if (Environment.ProcessorCount == 24)
+				{
+					affinity = (IntPtr) 0x00FC0000;
+				}
+				else
+				{
+					affinity = (IntPtr) 0x0E00;
+				}
 			}else if (Regex.IsMatch(processorName, @" 3950(X|XT)?", RegexOptions.Singleline))
 			{
 				// 16C/32T(4C/CCX)
-				affinity = (IntPtr) 0xFF000000;
+				if (Environment.ProcessorCount == 32)
+				{
+					affinity = (IntPtr) 0xFF000000;
+				}
+				else
+				{
+					affinity = (IntPtr) 0xF000;
+				}
+
 			}else if (Regex.IsMatch(processorName, @" 5900X", RegexOptions.Singleline))
 			{
 				// 12C/24T(6C/CCX)
-				affinity = (IntPtr) 0x00FFF000;
+				if (Environment.ProcessorCount == 24)
+				{
+					affinity = (IntPtr) 0x00FFF000;
+				}
+				else
+				{
+					affinity = (IntPtr) 0x0FC0;
+				}
 			}else if (Regex.IsMatch(processorName, @" 5950X", RegexOptions.Singleline))
 			{
 				// 16C/32T(8C/CCX)
-				affinity = (IntPtr) 0xFFFF0000;
+				if (Environment.ProcessorCount == 32)
+				{
+					affinity = (IntPtr) 0xFFFF0000;
+				}
+				else
+				{
+					affinity = (IntPtr) 0xFF00;
+				}
 			}
 			else
 			{