Skip to content

Use normal JS library aliases for GL symbols. NFC #19033

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
Merged
sbc100 merged 1 commit into from
Mar 22, 2023
Merged

Use normal JS library aliases for GL symbols. NFC #19033

sbc100 merged 1 commit into from
Mar 22, 2023

Conversation

@sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Mar 22, 2023

The recordGLProcAddressGet helper was attempt to resolve and create aliases using copyLibEntry, but this function doesn't work when the target of the alias exists in a different library file.

This was resulting undefined being set for these aliases and the resulting JS code would contains, for example:

var glGenFramebuffersOES = undefined;

Completely removing the aliasing resolution and the symbol copying from recordGLProcAddressGet seems to do the right thing, and should save on code size too:

var _glGenFramebuffersOES = _glGenFramebuffers;

@sbc100
Use normal JS library aliases for GL symbols. NFC
6c39c7d 
The `recordGLProcAddressGet` helper was attempt to resolve and
create aliases using `copyLibEntry`, but this function doesn't work
when the target of the alias exists in a different library file.

This was resulting `undefined` being set for these aliases and the
resulting JS code would contains, for example:

```
var glGenFramebuffersOES = undefined;
```

Completely removing the aliasing resolution and the symbol copying
from `recordGLProcAddressGet` seems to do the right thing, and should
save on code size too:

```
var _glGenFramebuffersOES = _glGenFramebuffers;
```
@sbc100 sbc100 requested a review from kripken March 22, 2023 07:33
@sbc100 sbc100 mentioned this pull request Mar 22, 2023
Closed
@sbc100 sbc100 requested a review from juj March 22, 2023 07:33
kripken
kripken reviewed Mar 22, 2023
View reviewed changes
Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

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

What is the difference in the output from this? (I forget, does the normal alias mechanism duplicate the function or not? The removed code looks like it duplicates.)

@sbc100
Copy link
Collaborator Author

sbc100 commented Mar 22, 2023

What is the difference in the output from this? (I forget, does the normal alias mechanism duplicate the function or not? The removed code looks like it duplicates.)

Yes, it removes the duplication, so it should be codesize saving too.

I think the duplication might have been there from the fastcomp days when the JS and native symbol space was more like a single thing? I'm not sure.

@kripken
Copy link
Member

kripken commented Mar 22, 2023

It's possible that back then we thought it might be slightly faster to duplicate the code. But I doubt that's true.

@sbc100 sbc100 enabled auto-merge (squash) March 22, 2023 17:08
@sbc100 sbc100 merged commit fda8dd1 into main Mar 22, 2023
@sbc100 sbc100 deleted the gl_symbol_aliases branch March 22, 2023 17:31
sbc100 added a commit that referenced this pull request Mar 22, 2023
@sbc100
jsifier: Add explicit error messages for missing/native alias targets
438ed21 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier chooses not to include
the JS version but the location where the aliases are declared in the
output comes before the native symbols are declared.

To fix this I removed the native aliases from webgl2.c, since these
exact same aliases already exist in library_webgl.js.

This think is also more correct since it means that the `emscripten_xx`
wrappers are defined fully in JS and are not effected by definitions
in native code (which is the whole point of them I believe).
@sbc100 sbc100 mentioned this pull request Mar 22, 2023
Closed
sbc100 added a commit that referenced this pull request Mar 22, 2023
@sbc100
jsifier: Add explicit error messages for missing/native alias targets
e2af8ce 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier chooses not to include
the JS version but the location where the aliases are declared in the
output comes before the native symbols are declared.

To fix this I removed the native aliases from webgl2.c, since these
exact same aliases already exist in library_webgl.js.

This think is also more correct since it means that the `emscripten_xx`
wrappers are defined fully in JS and are not effected by definitions
in native code (which is the whole point of them I believe).
sbc100 added a commit that referenced this pull request Mar 22, 2023
@sbc100
jsifier: Add explicit error messages for missing/native alias targets
349f1a0 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier chooses not to include
the JS version but the location where the aliases are declared in the
output comes before the native symbols are declared.

To fix this I removed the native aliases from webgl2.c, since these
exact same aliases already exist in library_webgl.js.

This think is also more correct since it means that the `emscripten_xx`
wrappers are defined fully in JS and are not effected by definitions
in native code (which is the whole point of them I believe).
sbc100 added a commit that referenced this pull request Mar 22, 2023
@sbc100
jsifier: Add explicit error messages for missing/native alias targets
f4be7f8 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier chooses not to include
the JS version but the location where the aliases are declared in the
output comes before the native symbols are declared.

To fix this I removed the native aliases from webgl2.c, since these
exact same aliases already exist in library_webgl.js.

This think is also more correct since it means that the `emscripten_xx`
wrappers are defined fully in JS and are not effected by definitions
in native code (which is the whole point of them I believe).
sbc100 added a commit that referenced this pull request Mar 22, 2023
@sbc100
jsifier: Add explicit error messages for missing/native alias targets
45ed231 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier chooses not to include
the JS version but the location where the aliases are declared in the
output comes before the native symbols are declared.

To fix this I removed the native aliases from webgl2.c, since these
exact same aliases already exist in library_webgl.js.

This think is also more correct since it means that the `emscripten_xx`
wrappers are defined fully in JS and are not effected by definitions
in native code (which is the whole point of them I believe).
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
ad3cc44 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
@sbc100 sbc100 mentioned this pull request Mar 23, 2023
Merged
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
586fd40 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
5bf875a 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
07f4985 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
e9b6796 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
8ae41e7 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
ceb804f 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
54eca92 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
28fbf6b 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
76fe398 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 23, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists
9d74f60 
Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
sbc100 added a commit that referenced this pull request Mar 30, 2023
@sbc100
jsifier: Make JS libraries aliases work even when native export exists (
3a285cb 
#19046)

Followup to #19033.

Updating the `test_closure_full_js_library` to include webgl2 caused
a lot of `JSC_REFERENCE_BEFORE_DECLARE` closure errors.

This is because we had JS aliases who's target was defined both in
JS and in native code.  In this case the jsifier was choosing not to
include the JS version, which in the case of the GL symbols not what
we want.  This is why, prior to #19033, we were duplicating the library
entries.

This this change JS symbol aliases now force the alias target to be
included from the JS library, even in the case that the native code
also emits its own version of a symbol.

This happens in the case of pthreads + MAIN_MODULE +
OFFSCREEN_FRAMEBUFFER. In this mode webgl2.c defines (and also exports)
the entire set of GL library symbols.  In this case we still want the
`emscripten_XX` aliases to point to the original JS versions, no the
natively exported version.

Sadly it looks like we have at testing gab for that particular
combination.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kripken kripken kripken approved these changes

@juj juj Awaiting requested review from juj

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sbc100 @kripken