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

Combine extinst-name and extinst-output-base into one arg. #3200

Merged
merged 2 commits into from
Feb 25, 2020
Merged

Combine extinst-name and extinst-output-base into one arg. #3200

merged 2 commits into from
Feb 25, 2020

Conversation

vonture
Copy link
Contributor

@vonture vonture commented Feb 21, 2020

Some build systems such as Android blueprints require that the inputs
and outputs of generator scripts are all provided as arguments. These
two arguments to generate_language_headers.py are combined to form the
output path in the script. This change simply lets the user provide the
whole output path as an argument.

I wasn't able to test to bazel build files locally.

@vonture
Combine the extinst-name and extinst-output-base into one arg.
16a89b7 
Some build systems such as Android blueprints require that the inputs
and outputs of generator scripts are all provided as arguments.  These
two arguments to generate_language_headers.py are combined to form the
output path in the script.  This change simply lets the user provide the
whole output path as an argument.
@vonture vonture changed the title Combine the extinst-name and extinst-output-base into one arg. Combine extinst-name and extinst-output-base into one arg. Feb 21, 2020
@vonture vonture requested a review from dneto0 February 21, 2020 21:43
@vonture
Copy link
Contributor Author

vonture commented Feb 21, 2020

David, PTAL.

@dneto0
Copy link
Collaborator

dneto0 commented Feb 21, 2020

I had ambitions for this script to generate multiple language headers for each grammar file. But in the end I only made it for a single output C/C++.

This is a sensible change and I can definitely see how it makes it easier to blend into various build systems. If I ever get to the other language outputs, I can always add new options for each new output.

@vonture
Copy link
Contributor Author

vonture commented Feb 24, 2020

Hey David, I think I fixed the issues with ndk and bazel builds, can you re-run kokoro?

@vonture
Copy link
Contributor Author

vonture commented Feb 24, 2020

Awesome, thanks. Is this good to land?

@dneto0 dneto0 merged commit fb6e3e4 into KhronosGroup:master Feb 25, 2020
dneto0 pushed a commit to dneto0/SPIRV-Tools that referenced this pull request Sep 14, 2024
@zoddicus
Rolling 6 dependencies and updating expectations (KhronosGroup#990)
06b6db6 
Roll third_party/glslang/ c12493f..56364b6 (7 commits)

KhronosGroup/glslang@c12493f...56364b6

$ git log c12493f..56364b6 --date=short --no-merges --format='%ad %ae %s'
2020-03-01 cepheus Copyright update, mostly to trigger bots again.
2020-03-01 cepheus Fix KhronosGroup#2095: correct the indentation.
2020-02-28 cepheus Fix KhronosGroup#1461: set the SPIRV-Tools' optimizer's target environment.
2020-02-28 cepheus Fix KhronosGroup#2091, remove incorrect assert for division by 0.0.
2020-02-28 wangli28 Add vcpkg installation instructions
2020-02-28 sk Fix for KhronosGroup#2075: removed DefaultTBuiltInResource from glslang_c_interface.cpp
2020-02-22 rex.xu Fix an issue of SPV generation for imageAtomicStore.

Roll third_party/googletest/ 23b2a3b1c..e588eb1ff (3 commits)

google/googletest@23b2a3b...e588eb1

$ git log 23b2a3b1c..e588eb1ff --date=short --no-merges --format='%ad %ae %s'
2020-02-27 absl-team Googletest export
2020-02-25 absl-team Googletest export
2020-02-19 absl-team Googletest export

Roll third_party/re2/ 793b4e85e..f734980e7 (7 commits)

google/re2@793b4e8...f734980

$ git log 793b4e85e..f734980e7 --date=short --no-merges --format='%ad %ae %s'
2020-03-01 junyer Bump SONAME to reflect the ABI break.
2020-02-28 junyer Add macOS and Xcode jobs to the Travis CI matrix.
2020-02-26 junyer Don't break the RE2 object when compiling the reverse Prog fails.
2020-02-26 junyer Revert "Refuse to rewrite when MaxSubmatch() is too large."
2020-02-25 junyer Fall back to NFA execution when compiling the reverse Prog failed.
2020-02-25 junyer Refuse to rewrite when MaxSubmatch() is too large.
2020-02-20 junyer Tweak the comment on RE2::QuoteMeta().

Roll third_party/spirv-cross/ f19fdb94d..9deb6ffbb (6 commits)

KhronosGroup/SPIRV-Cross@f19fdb9...9deb6ff

$ git log f19fdb94d..9deb6ffbb --date=short --no-merges --format='%ad %ae %s'
2020-03-02 post Add -V alias for --vulkan-semantics.
2020-02-24 post MSL: Add C API for force native arrays.
2020-02-24 post MSL: Add native array test for composite array initialization.
2020-02-24 post MSL: Reintroduce workaround for constant arrays being passed by value.
2020-02-24 post MSL: Reinstate workaround for returning arrays.
2020-02-24 post MSL: Add a workaround path to force native arrays for everything.

Roll third_party/spirv-headers/ 5dbc1c3..0a7fc45 (1 commit)

KhronosGroup/SPIRV-Headers@5dbc1c3...0a7fc45

$ git log 5dbc1c3..0a7fc45 --date=short --no-merges --format='%ad %ae %s'
2020-02-26 dneto Add grammars, C header, and header generator for vendor and KHR extended instruction sets (KhronosGroup#143)

Roll third_party/spirv-tools/ 4a80497..e1688b6 (8 commits)

KhronosGroup/SPIRV-Tools@4a80497...e1688b6

$ git log 4a80497..e1688b6 --date=short --no-merges --format='%ad %ae %s'
2020-02-28 dneto Avoid use of Python distutils.dir_util (KhronosGroup#3203)
2020-02-28 rharrison Adding WebGPU specific Workgroup scope rule (KhronosGroup#3204)
2020-02-25 jaebaek Add validation rules for OpenCL.DebugInfo.100 extension (KhronosGroup#3133)
2020-02-25 geofflang Combine extinst-name and extinst-output-base into one arg. (KhronosGroup#3200)
2020-02-23 nicolasweber Fix Wrange-loop-analysis warnings in SPIRV-Tools. (KhronosGroup#3201)
2020-02-21 geofflang Add missing dependencies when generating spvtools_core_tables (KhronosGroup#3199)
2020-02-21 afdx Brief guide to writing a spirv-fuzz fuzzer pass (KhronosGroup#3190)
2020-02-21 47594367+rg3igalia Fix ignored const qualifier warning in static_cast (KhronosGroup#3197)

Created with:
  roll-dep third_party/effcee third_party/glslang third_party/googletest third_party/re2 third_party/spirv-cross third_party/spirv-headers third_party/spirv-tools
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dneto0 dneto0 dneto0 approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@vonture @dneto0 @kokoro-team @s-perron