Skip to content

Commit

Permalink
Fixed a couple of spelling mistakes
Browse files Browse the repository at this point in the history
Reverted back from TortureHyperthreading to the "old" mechanic of 2 worker threads (fixes #33)
  • Loading branch information
sp00n committed Sep 10, 2022
1 parent 36da1d0 commit 0ce7e5e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
16 changes: 8 additions & 8 deletions config.default.ini
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ suspendPeriodically = 1
coreTestOrder = Default


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


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

Expand All @@ -91,7 +91,7 @@ numberOfThreads = 1


# The max number of iterations
# High values are basically unlimited
# High values are basically unlimited (good for testing over night)
# Default: 10000
maxIterations = 10000

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

Expand Down
19 changes: 11 additions & 8 deletions script-corecycler.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.AUTHOR
sp00n
.VERSION
0.9.1.1
0.9.1.2
.DESCRIPTION
Sets the affinity of the selected stress test program process to only one core and cycles through
all the cores to test the stability of a Curve Optimizer setting
Expand All @@ -17,7 +17,7 @@
#>

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

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

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

Expand Down

0 comments on commit 0ce7e5e

Please sign in to comment.