Skip to content

Disable thread write tests for 32-bit builds. #733

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 1 commit into from
Jan 23, 2023
Merged

Disable thread write tests for 32-bit builds. #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions src/gpgmm/utils/Compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@
// Both GPGMM_UNUSED_FUNC and GPGMM_DECLARE_UNUSED may be necessary, e.g. to suppress clang's
// unneeded-internal-declaration warning.

// For 32-bit detection. Copied from vulkan_core.h.
#ifndef GPGMM_COMPILER_IS_64_BIT
# if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || \
defined(_M_X64) || defined(__ia64) || defined(_M_IA64) || defined(__aarch64__) || \
defined(__powerpc64__)
# define GPGMM_COMPILER_IS_64_BIT 1
# else
# define GPGMM_COMPILER_IS_64_BIT 0
# endif
#endif

// Clang and GCC, check for __clang__ too to catch clang-cl masquarading as MSVC
#if defined(__GNUC__) || defined(__clang__)
# if defined(__clang__)
Expand Down
13 changes: 11 additions & 2 deletions src/tests/unittests/EventTraceWriterTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <gtest/gtest.h>

#include "gpgmm/common/TraceEvent.h"
#include "tests/GPGMMTest.h"

#include <thread>
#include <vector>
Expand All @@ -35,6 +34,11 @@ class EventTraceWriterTests : public testing::Test {
};

TEST_F(EventTraceWriterTests, SingleThreadWrites) {
// TODO: Figure out why win_clang_[rel|dbg]_x86 builder fails.
#ifndef GPGMM_COMPILER_IS_64_BIT
GPGMM_SKIP_TEST_IF(true);
#endif

constexpr uint32_t kEventCount = 64u;
for (size_t i = 0; i < kEventCount; i++) {
TRACE_EVENT_INSTANT0(TraceEventCategory::kDefault, "InstantEvent");
Expand All @@ -45,6 +49,11 @@ TEST_F(EventTraceWriterTests, SingleThreadWrites) {
}

TEST_F(EventTraceWriterTests, MultiThreadWrites) {
// TODO: Figure out why win_clang_[rel|dbg]_x86 builder fails.
#ifndef GPGMM_COMPILER_IS_64_BIT
GPGMM_SKIP_TEST_IF(true);
#endif

constexpr uint32_t kThreadCount = 64u;
std::vector<std::thread> threads(kThreadCount);
for (size_t threadIdx = 0; threadIdx < threads.size(); threadIdx++) {
Expand Down