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

Code merge with upstream 5.10.0 #2

Merged
merged 129 commits into from
Apr 4, 2020
Merged

Code merge with upstream 5.10.0 #2

merged 129 commits into from
Apr 4, 2020

Conversation

MIPPL
Copy link

@MIPPL MIPPL commented Apr 4, 2020

merged biblepay xmrig master branch (5.6.x) with upstream (5.10.0)

Resolved conflicts at

version.h
backend/cpu/CpuWorker.cpp
base/base.cmake
net/Network.cpp, .h

xmrig and others added 29 commits March 8, 2020 02:43
Activate MSR mod only for RandomX algorithms
Added "astrobwt-avx2" parameter in config.json, it's turned off ("false") by default.

4-5% speedup on CPUs with proper AVX2 support (AMD Ryzen starting with Zen2, Intel Core starting with Haswell).

There will be no speedup on the following CPUs:

- Intel Pentium/Celeron don't support AVX2
- AMD Zen/Zen+ have only half-speed AVX

GCC compiled version is faster without AVX2, MSVC compiled version is faster with AVX2
AVX2 optimized code for AstroBWT
* commit 'f9c65f3bbffba412ca9a69477dcf0cd083c0d4cd': (89 commits)
  Update CHANGELOG.md
  Fixed gcc build.
  AstroBWT OpenCL code
  v5.10.0
  xmrig#1601 Fixed compatibility with OpenSSL 1.0.x.
  Reduced memory consumption on network level.
  Update CHANGELOG.md
  v5.10.0-dev
  Added TLS support for API and many other TLS related changes.
  Added command line option --astrobwt-avx2
  Fix MacOS compilation
  AVX2 optimized code for AstroBWT
  Added command line option --data-dir.
  Activate MSR mod only for RandomX algorithms
  "cn/gpu" algorithm now disabled by default and will be removed in next major release.
  Move files.
  v5.9.1-dev
  v5.9.0
  xmrig#1585 Fixed build without HTTP support.
  Sync changes with proxy.
  ...

# Conflicts:
#	src/backend/cpu/CpuWorker.cpp
#	src/base/base.cmake
#	src/base/net/stratum/Client.cpp
#	src/base/net/stratum/Client.h
#	src/net/JobResults.cpp
#	src/net/Network.cpp
#	src/net/Network.h
#	src/version.h
@biblepay biblepay merged commit 376a944 into biblepay:master Apr 4, 2020
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.

5 participants