Update .travis.yml #117
Merged
Update .travis.yml #117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change naming of development build artifacts published on github.
vmaksimo
pushed a commit
to vmaksimo/SPIRV-LLVM-Translator
that referenced
this pull request
Sep 1, 2022
…le_decorations extension .. '"master"' -> '"xmain-web"' (1 commits) (KhronosGroup#117) * Resolve of merge (conflict) 8937ecf Implement SPV_INTEL_global_variable_decorations extension .. '"master"' -> '"xmain-web"' (1 commits) CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/spirv_internal.hpp CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/SPIRVDecorate.cpp CONFLICT (content): Merge conflict in include/LLVMSPIRVExtensions.inc commit 8937ecf Author: Viktoria Maximova <[email protected]> Date: Thu Feb 3 17:53:08 2022 +0300 Implement SPV_INTEL_global_variable_decorations extension (KhronosGroup#1389) * Implement SPV_INTEL_global_variable_decorations extension This change adds support of decorations applied to global variables through `spirv.Decorations` metadata in LLVM IR. These decorations are mostly intended to help code generation for FPGA devices: * HostAccessINTEL * InitModeINTEL * ImplementInCSRINTEL Spec: https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/DeviceGlobal/SPV_INTEL_global_variable_decorations.asciidoc * Resolve conflicts Co-authored-by: iclsrc <[email protected]> Co-authored-by: Sergey Semenov <[email protected]>
vmaksimo
pushed a commit
to vmaksimo/SPIRV-LLVM-Translator
that referenced
this pull request
Sep 1, 2022
…al_variable_decorations extension .. '"master"' -> '"xmain-web"' (1 commits) (KhronosGroup#117) * Resolve of merge (conflict) 8937ecf Implement SPV_INTEL_global_variable_decorations extension .. '"master"' -> '"xmain-web"' (1 commits) CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/spirv_internal.hpp CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h CONFLICT (content): Merge conflict in lib/SPIRV/libSPIRV/SPIRVDecorate.cpp CONFLICT (content): Merge conflict in include/LLVMSPIRVExtensions.inc commit 8937ecf Author: Viktoria Maximova <[email protected]> Date: Thu Feb 3 17:53:08 2022 +0300 Implement SPV_INTEL_global_variable_decorations extension (KhronosGroup#1389) * Implement SPV_INTEL_global_variable_decorations extension This change adds support of decorations applied to global variables through `spirv.Decorations` metadata in LLVM IR. These decorations are mostly intended to help code generation for FPGA devices: * HostAccessINTEL * InitModeINTEL * ImplementInCSRINTEL Spec: https://github.com/intel/llvm/blob/sycl/sycl/doc/extensions/DeviceGlobal/SPV_INTEL_global_variable_decorations.asciidoc * Resolve conflicts Co-authored-by: iclsrc <[email protected]> Co-authored-by: Sergey Semenov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change naming of development build artifacts published on github.