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.

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

Jump to bottom

Define QTHREAD_ARM and include defines in config test #134

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Define QTHREAD_ARM and include defines in config test #134

merged 1 commit into from
Jun 22, 2023

Conversation

janciesko
Copy link
Collaborator

This adds the definition of QTHREAD_ARM so it would not resolve to the same as QTHREAD_UNSUPPORTED in scenarios such as as #if (QTHREAD_ASSEMBLY_ARCH == QTHREAD_ARM).
This also updates definitions in the cacheline conf m4.

/* Architecture defines */
#define QTHREAD_UNSUPPORTED 0
#define QTHREAD_IA32        1
#define QTHREAD_AMD64       2
#define QTHREAD_IA64        3
#define QTHREAD_ALPHA       4
#define QTHREAD_MIPS        5
#define QTHREAD_POWERPC32   6
#define QTHREAD_POWERPC64   7
#define QTHREAD_SPARCV9_32  8
#define QTHREAD_SPARCV9_64  9
#define QTHREAD_TILEPRO	    10
#define QTHREAD_TILEGX	    11
#define QTHREAD_ARM         12
#define QTHREAD_ARMV8_A64   13

@janciesko janciesko mentioned this pull request Jun 14, 2023
Closed
dmk42
dmk42 reviewed Jun 14, 2023
View reviewed changes
Copy link
Contributor

@dmk42 dmk42 left a comment

Choose a reason for hiding this comment

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

Thanks for doing this! There might be a misspelling, depending on what you intend.

config/qthread_ia_cacheline.m4 Outdated
@@ -16,6 +16,10 @@ AC_CACHE_CHECK([for x86 cache line size],
#define QTHREAD_POWERPC64 7
#define QTHREAD_SPARCV9_32 8
#define QTHREAD_SPARCV9_64 9
#define QTHREAD_TILEPRO 10
#define QTHREAD_TILEGX 11
#define QTHREAD_ARMV 12
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this was intended to be QTHREAD_ARM instead of QTHREAD_ARMV, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is resolved now. Thanks!

include/qthread/common.h.in Outdated
@@ -122,6 +122,7 @@
#define QTHREAD_SPARCV9_64 9
#define QTHREAD_TILEPRO 10
#define QTHREAD_TILEGX 11
#define QTHREAD_ARMV8_A64 12
#define QTHREAD_ARMV 12
Copy link
Contributor

Choose a reason for hiding this comment

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

Same thing here.

Copy link
Contributor

Choose a reason for hiding this comment

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

So is this.

dmk42
dmk42 approved these changes Jun 16, 2023
View reviewed changes
Copy link
Contributor

@dmk42 dmk42 left a comment

Choose a reason for hiding this comment

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

I have no authority here; I'm just showing my support by approving.

@janciesko janciesko merged commit 3801d40 into sandialabs:main Jun 22, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmk42 dmk42 dmk42 approved these changes

@olivier-snl olivier-snl Awaiting requested review from olivier-snl

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@janciesko @dmk42