Skip to content
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.

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

Ensure we never benchmark less than two salts for "Many salts". #3922

Merged
merged 1 commit into from May 11, 2019

Conversation

magnumripper
Copy link
Member

Closes #3912.

@magnumripper
Copy link
Member Author

@solardiz I never found a format to positively test this with... Just dry-running, I could see why it could happen and why it should not with this fix - but I can't say I'm 100% sure.

@solardiz
Copy link
Member

Here's my test prior to this PR's changes:

[solar@localhost src]$ grep BenchmarkMany ../run/john.conf 
BenchmarkMany = Y

[solar@localhost src]$ GOMP_CPU_AFFINITY=0-255 GOMP_SPINCOUNT=10000 ../run/john -test -form=ecryptfs
Will run 256 OpenMP threads
Benchmarking: eCryptfs (65536 iterations) [SHA512 512/512 AVX512F 8x]... (256xOMP) DONE
Warning: "Many salts" test limited: 1/256
Many salts:     6113 c/s real, 24.6 c/s virtual
Only one salt:  6206 c/s real, 24.6 c/s virtual

[solar@localhost src]$ GOMP_CPU_AFFINITY=0-255 GOMP_SPINCOUNT=10000 ../run/john -test -form=ecryptfs
Will run 256 OpenMP threads
Benchmarking: eCryptfs (65536 iterations) [SHA512 512/512 AVX512F 8x]... (256xOMP) DONE
Warning: "Many salts" test limited: 1/256
Many salts:     6206 c/s real, 24.6 c/s virtual
Only one salt:  6159 c/s real, 24.6 c/s virtual

@solardiz
Copy link
Member

Same test on branch 3912:

[solar@localhost src]$ git branch
* (detached from bleeding-jumbo/3912)
  bleeding-jumbo
[solar@localhost src]$ GOMP_CPU_AFFINITY=0-255 GOMP_SPINCOUNT=10000 ../run/john -test -form=ecryptfs
Will run 256 OpenMP threads
Benchmarking: eCryptfs (65536 iterations) [SHA512 512/512 AVX512F 8x]... (256xOMP) DONE
Warning: "Many salts" test limited: 2/256
Many salts:     6159 c/s real, 24.6 c/s virtual
Only one salt:  6068 c/s real, 24.6 c/s virtual

[solar@localhost src]$ GOMP_CPU_AFFINITY=0-255 GOMP_SPINCOUNT=10000 ../run/john -test -form=ecryptfs
Will run 256 OpenMP threads
Benchmarking: eCryptfs (65536 iterations) [SHA512 512/512 AVX512F 8x]... (256xOMP) DONE
Warning: "Many salts" test limited: 2/256
Many salts:     6159 c/s real, 24.6 c/s virtual
Only one salt:  6206 c/s real, 24.6 c/s virtual

Copy link
Member

@solardiz solardiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This passed my testing. Thanks!

@solardiz solardiz merged commit 9966247 into bleeding-jumbo May 11, 2019
@magnumripper magnumripper deleted the 3912 branch May 12, 2019 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Warning: "Many salts" test limited: 1/256
2 participants