Skip to content

[ML] Make atomic operations safer for aarch64 #1893

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 10, 2021
Merged

[ML] Make atomic operations safer for aarch64 #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f80504
[ML] Make atomic operations safer for aarch64
droberts195 May 10, 2021
fa06cb5
Add changelog
droberts195 May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
* The Linux build platform for the {ml} C++ code is now CentOS 7 running gcc 9.3. (See
{ml-pull}1170[#1170].)

== {es} version 7.14.0

=== Bug Fixes

* Make atomic operations safer for aarch64. (See {ml-pull}1893[#1893].)

== {es} version 7.13.0

=== Enhancements
Expand Down
6 changes: 3 additions & 3 deletions include/maths/CIntegration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,10 @@ class MATHS_EXPORT CIntegration {
static const CSparseGaussLegendreQuadrature& instance() {
const CSparseGaussLegendreQuadrature* tmp =
ms_Instance.load(std::memory_order_acquire);
if (!tmp) {
if (tmp == nullptr) {
core::CScopedFastLock scopedLock(CIntegration::ms_Mutex);
tmp = ms_Instance.load(std::memory_order_relaxed);
if (!tmp) {
tmp = ms_Instance.load(std::memory_order_acquire);
if (tmp == nullptr) {
tmp = new CSparseGaussLegendreQuadrature();
ms_Instance.store(tmp, std::memory_order_release);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/model/CStringStore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ core::CStoredStringPtr CStringStore::get(const std::string& value) {
}
}
} else {
m_Reading.fetch_sub(1, std::memory_order_relaxed);
m_Reading.fetch_sub(1, std::memory_order_release);
// This is leaked in the sense that it will never be shared and won't
// count towards our reported memory usage. But it is not leaked
// in the traditional sense of the word, as its memory will be freed
Expand Down