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

Make -msse explicitly require -msimd128 #11312

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Current Trunk
- Removed obsolete SIMD.js support (-s SIMD=1). Use -msimd128 to target Wasm
SIMD. (#11180)
- Add warning about fastcomp deprecation (can be disabled via `-Wno-fastcomp`).
- Removed obsolete SIMD.js support (-s SIMD=1). Use -msimd128 to target Wasm SIMD. (#11180)
Copy link
Member

Choose a reason for hiding this comment

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

Why remove this line? I think this is still relevant.

Copy link
Member

Choose a reason for hiding this comment

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

It's a removal of a duplicate. See 2 lines above.

- The mmap method of JavaScript filesystem drivers (based on library_fs.js) no
longer takes a target memory. It's safer/cleaner/smaller to assume the target
is the global memory buffer.
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmark_sse1.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def path_from_root(*pathelems):

# Run emscripten build
out_file = os.path.join(temp_dir, 'benchmark_sse1_html.js')
cmd = [EMCC, path_from_root('tests', 'sse', 'benchmark_sse1.cpp'), '-O3', '-msse', '-s', 'SIMD=1', '-s', 'TOTAL_MEMORY=536870912', '-o', out_file]
cmd = [EMCC, path_from_root('tests', 'sse', 'benchmark_sse1.cpp'), '-O3', '-msse', '-msimd128', '-s', 'TOTAL_MEMORY=536870912', '-o', out_file]
print 'Building Emscripten version of the benchmark:'
print ' '.join(cmd)
build = Popen(cmd)
Expand Down
3 changes: 3 additions & 0 deletions tools/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,9 @@ def include_directive(paths):
return result

if '-msse' in user_args:
if not Settings.BINARYEN_SIMD:
exit_with_error('-msse requires -msimd128')

c_opts += ['-D__SSE__=1'] + include_directive([path_from_root('system', 'include', 'SSE')])

# libcxx include paths must be defined before libc's include paths otherwise libcxx will not build
Expand Down