Skip to content

Commit 0ce7e5e

Browse files
committed
Fixed a couple of spelling mistakes
Reverted back from TortureHyperthreading to the "old" mechanic of 2 worker threads (fixes #33)
1 parent 36da1d0 commit 0ce7e5e

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

config.default.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ suspendPeriodically = 1
6767
coreTestOrder = Default
6868

6969

70-
# Skip a core that has thrown an error on the following iterations
71-
# If set to 0, this will test a core on the next iterations even if has thrown an error before
70+
# Skip a core that has thrown an error in the following iterations
71+
# If set to 0, this will test a core in the next iterations even if has thrown an error before
7272
# Default: 1
7373
skipCoreOnError = 1
7474

7575

7676
# Stop the whole testing process if an error occurred
7777
# If set to 0 (default), the stress test programm will be restarted when an error
78-
# occurs and the core that caused the error will be skipped on the next iteration
78+
# occurs and the core that caused the error will be skipped in the next iteration
7979
# Default: 0
8080
stopOnError = 0
8181

@@ -91,7 +91,7 @@ numberOfThreads = 1
9191

9292

9393
# The max number of iterations
94-
# High values are basically unlimited
94+
# High values are basically unlimited (good for testing over night)
9595
# Default: 10000
9696
maxIterations = 10000
9797

@@ -150,9 +150,9 @@ mode = SSE
150150
# The FFT size preset to test for Prime95
151151
# These are basically the presets as present in Prime95, plus an additional few
152152
# Note: If "mode" is set to "CUSTOM", this setting will be ignored
153-
# Smallest: 4K to 21K - Prime95 preset: "tests L1/L2 caches, high power/heat/CPU stress"
154-
# Small: 36K to 248K - Prime95 preset: "tests L1/L2/L3 caches, maximum power/heat/CPU stress"
155-
# Large: 426K to 8192K - Prime95 preset: "stresses memory controller and RAM" (although dedicated memory stress testing is disabled here by default!)
153+
# Smallest: 4K to 21K - Prime95 preset text: "tests L1/L2 caches, high power/heat/CPU stress"
154+
# Small: 36K to 248K - Prime95 preset text: "tests L1/L2/L3 caches, maximum power/heat/CPU stress"
155+
# Large: 426K to 8192K - Prime95 preset text: "stresses memory controller and RAM" (although dedicated memory stress testing is disabled here by default!)
156156
# Huge: 8960K to MAX - anything beginning at 8960K up to the highest FFT size (32768K for SSE/AVX, 51200K for AVX2)
157157
# All: 4K to MAX - 4K to up to the highest FFT size (32768K for SSE/AVX, 51200K for AVX2)
158158
# Moderate: 1344K to 4096K - special preset, recommended in the "Curve Optimizer Guide Ryzen 5000"
@@ -240,7 +240,7 @@ name = CoreCycler
240240
# 1: Write additional information to the log file (verbose)
241241
# 2: Write even more information to the log file (debug)
242242
# 3: Also display the verbose messages in the terminal
243-
# 4: Also display he debug messages in the terminal
243+
# 4: Also display the debug messages in the terminal
244244
# Default: 2
245245
logLevel = 2
246246

script-corecycler.ps1

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.AUTHOR
33
sp00n
44
.VERSION
5-
0.9.1.1
5+
0.9.1.2
66
.DESCRIPTION
77
Sets the affinity of the selected stress test program process to only one core and cycles through
88
all the cores to test the stability of a Curve Optimizer setting
@@ -17,7 +17,7 @@
1717
#>
1818

1919
# Global variables
20-
$version = '0.9.1.1'
20+
$version = '0.9.1.2'
2121
$startDate = Get-Date
2222
$startDateTime = Get-Date -format yyyy-MM-dd_HH-mm-ss
2323
$logFilePath = 'logs'
@@ -811,7 +811,7 @@ function Get-PerformanceCounterLocalName {
811811
.DESCRIPTION
812812
This is used to get the Performance Counter IDs, which will be used to get the localized names
813813
.PARAMETER englishCounterNames
814-
[Array] An arraay with the english names of the counters
814+
[Array] An array with the english names of the counters
815815
.OUTPUTS
816816
[HashTable] A hashtable with Name:ID pairs of the counters
817817
#>
@@ -1632,7 +1632,9 @@ function Get-TortureWeakValue {
16321632
16331633
- Only CPU_AVX512F, CPU_FMA3, CPU_AVX & CPU_SSE2 is used for the calculation
16341634
- If one of these is set to disabled, add the number to the total value
1635-
- AVX512 is never available on Ryzen
1635+
- AVX512 is never available on Ryzen <= 5000
1636+
- AVX512 seems to be available beginning with Ryzen 7000
1637+
- TODO: Need a way to detect if AVX512 is available or not
16361638
16371639
All enabled (except AVX512):
16381640
1048576 --> CPU_AVX512F
@@ -2280,11 +2282,11 @@ function Initialize-Prime95 {
22802282
# Prime 30.7 and above:
22812283
if ($isPrime95_30_7) {
22822284
# If this is not set, Prime95 will create #numCores worker threads in 30.7+
2283-
Add-Content $configFile1 ('NumThreads=' + $settings.General.numberOfThreads)
2285+
Add-Content $configFile1 ('NumThreads=' + $settings.General.numberOfThreads) # This has been renamed from CpuNumHyperthreads
22842286
Add-Content $configFile1 ('WorkerThreads=' + $settings.General.numberOfThreads)
22852287

22862288
# If we're using TortureHyperthreading in prime.txt, this needs to stay at 1, even if we're using 2 threads
2287-
# TortureHyperthreading introduces inconsistencies with the log format for two threads though, so we won't use it
2289+
# TortureHyperthreading introduces inconsistencies with the log format for two threads, so we won't use it
22882290
# Add-Content $configFile1 ('NumThreads=1')
22892291
# Add-Content $configFile1 ('WorkerThreads=1')
22902292
}
@@ -2315,7 +2317,8 @@ function Initialize-Prime95 {
23152317
# TortureHyperthreading=0/1
23162318
# Goes into the prime.txt ($configFile2)
23172319
# If we set this here, we need to use NumThreads=1 in local.txt
2318-
# TortureHyperthreading introduces inconsistencies with the log format for two threads though, so we won't activate it
2320+
# However, TortureHyperthreading introduces inconsistencies with the log format for two threads, so we won't use it
2321+
# Instead, we're using the "old" mechanic of running two worker threads (as in 30.6 and before)
23192322
if ($isPrime95_30_7) {
23202323
# Add-Content $configFile2 ('TortureHyperthreading=' + ($settings.General.numberOfThreads - 1)) # Number of Threads = 2 -> Setting = 1 / Number of Threads = 1 -> Setting = 0
23212324
Add-Content $configFile2 ('TortureHyperthreading=0')
@@ -2356,7 +2359,7 @@ function Initialize-Prime95 {
23562359
#Add-Content $configFile2 ('WGUID_version=2') # The algorithm used to generate the Windows GUID. Not important
23572360
#Add-Content $configFile2 ('WorkPreference=0') # This seems to be a PrimeNet only setting
23582361

2359-
#Add-Content $configFile2 ('[PrimeNet]')
2362+
#Add-Content $configFile2 ('[PrimeNet]') # Settings for uploading Prime results, not required
23602363
#Add-Content $configFile2 ('Debug=0')
23612364
}
23622365

0 commit comments

Comments
 (0)