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

bpo-40280: Optimize ints and and startup on wasm (GH-29887) #29887

Merged
merged 1 commit into from
Dec 2, 2021
Merged
Changes from all commits
Commits
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
bpo-40280: Optimize ints and and startup on wasm
tiran committed Dec 2, 2021
commit ea91da6874b1a4dc9b8af1afb372792a7a8d7d87
12 changes: 8 additions & 4 deletions Include/pyport.h
Original file line number Diff line number Diff line change
@@ -87,13 +87,17 @@ Used in: Py_SAFE_DOWNCAST

/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all
the necessary integer types are available, and we're on a 64-bit platform
(as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */
(as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits.

From pyodide: WASM has 32 bit pointers but has native 64 bit arithmetic
so it is more efficient to use 30 bit digits.
*/

#ifndef PYLONG_BITS_IN_DIGIT
#if SIZEOF_VOID_P >= 8
#define PYLONG_BITS_IN_DIGIT 30
#if SIZEOF_VOID_P >= 8 || defined(__wasm__)
# define PYLONG_BITS_IN_DIGIT 30
#else
#define PYLONG_BITS_IN_DIGIT 15
# define PYLONG_BITS_IN_DIGIT 15
#endif
#endif

6 changes: 5 additions & 1 deletion Python/pylifecycle.c
Original file line number Diff line number Diff line change
@@ -2145,7 +2145,11 @@ is_valid_fd(int fd)
if (fd < 0) {
return 0;
}
#if defined(F_GETFD) && (defined(__linux__) || defined(__APPLE__) || defined(MS_WINDOWS))
#if defined(F_GETFD) && ( \
defined(__linux__) || \
defined(__APPLE__) || \
defined(MS_WINDOWS) || \
defined(__wasm__))
int res;
_Py_BEGIN_SUPPRESS_IPH
res = fcntl(fd, F_GETFD);