Skip to content

Conversation

@KornevNikita
Copy link
Contributor

@KornevNikita KornevNikita marked this pull request as ready for review January 15, 2022 13:45
@KornevNikita
Copy link
Contributor Author

@AlexeySotkin @MrSidims @AlexeySachkov take a look please

Copy link
Contributor

@MrSidims MrSidims left a comment

Choose a reason for hiding this comment

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

LGTM

@AlexeySotkin
Copy link
Contributor

@KornevNikita please resolve the merge conflicts.

@KornevNikita
Copy link
Contributor Author

@AlexeySotkin thanks, done.

@KornevNikita
Copy link
Contributor Author

Retrigger tests

@KornevNikita KornevNikita reopened this Feb 4, 2022
@AlexeySotkin AlexeySotkin merged commit 6e70d1c into KhronosGroup:master Feb 28, 2022
@KornevNikita KornevNikita deleted the printf branch March 29, 2022 08:16
svenvh pushed a commit to svenvh/SPIRV-LLVM-Translator that referenced this pull request Jun 21, 2022
svenvh pushed a commit that referenced this pull request Jun 22, 2022
Quetzonarch pushed a commit to Quetzonarch/SPIRV-LLVM-Translator that referenced this pull request Jul 13, 2022
vmaksimo pushed a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Sep 1, 2022
…ntf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 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 include/LLVMSPIRVExtensions.inc

  commit 6e70d1c
  Author: Nikita <[email protected]>
  Date:   Mon Feb 28 13:24:49 2022 +0300

      Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364)

      Spec: intel/llvm#5227
vmaksimo pushed a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Sep 1, 2022
…drspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 commits) (KhronosGroup#138)

* Resolve of merge (conflict) 6e70d1c Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 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 include/LLVMSPIRVExtensions.inc

  commit 6e70d1c
  Author: Nikita <[email protected]>
  Date:   Mon Feb 28 13:24:49 2022 +0300

      Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364)

      Spec: intel/llvm#5227

* Conflict resolution

Co-authored-by: iclsrc <[email protected]>
Co-authored-by: Dmitry Sidorov <[email protected]>
vmaksimo pushed a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Sep 1, 2022
…nstant_addrspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 commits) (KhronosGroup#138)

* Resolve of merge (conflict) 6e70d1c Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364) '"master"' -> '"xmain-web"' (32 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 include/LLVMSPIRVExtensions.inc

  commit 6e70d1c
  Author: Nikita <[email protected]>
  Date:   Mon Feb 28 13:24:49 2022 +0300

      Support SPV_INTEL_non_constant_addrspace_printf (KhronosGroup#1364)

      Spec: intel/llvm#5227

* Conflict resolution

Co-authored-by: iclsrc <[email protected]>
Co-authored-by: Dmitry Sidorov <[email protected]>
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Jan 23, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Jan 23, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Jan 23, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Jan 23, 2023
MrSidims pushed a commit that referenced this pull request Jan 24, 2023
MrSidims pushed a commit that referenced this pull request Jan 24, 2023
MrSidims pushed a commit that referenced this pull request Jan 26, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Feb 3, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Feb 6, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Feb 8, 2023
MrSidims pushed a commit that referenced this pull request Feb 8, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Mar 3, 2023
vmaksimo added a commit to vmaksimo/SPIRV-LLVM-Translator that referenced this pull request Mar 3, 2023
MrSidims pushed a commit that referenced this pull request Mar 6, 2023
MrSidims pushed a commit that referenced this pull request Mar 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants