Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

clvk: Bump to 0.0.20230124.132813g9635d8e0 

Signed-off-by: Aditya Alok <alok@termux.dev>
This commit is contained in:
Aditya Alok 2023-01-25 13:18:11 +05:30 committed by Jia Yuan Lo
parent 01bc9b34b4
commit 5930719dcf
2 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
packages/clvk/0000-revert-upstream-6ccb8a03.patch
View File

@ -1,26 +1,19 @@
https://github.com/kpet/clvk/issues/491
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 3e89b4d..5ba4c5d 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -183,14 +183,6 @@ jobs:
run: ${{ env.testbindir }}/api_tests${{ env.exe-ext }}
env:
CLVK_LOG: 2
- # TODO #477 - enable these tests
- # - name: API tests (physical addressing)
- # if: ${{ matrix.compiler-available && matrix.android-abi == '' }}
- # run: ${{ env.testbindir }}/api_tests${{ env.exe-ext }}
- # env:
- # CLVK_LOG: 2
- # CLVK_SPIRV_ARCH: spir64
- # CLVK_PHYSICAL_ADDRESSING: 1
- name: Offline compilation simple tests
if: ${{ matrix.android-abi == '' }}
run: |
src/api.cpp | 2 +-
src/config.def | 2 --
src/device.cpp | 15 ---------------
src/device.hpp | 2 --
src/kernel.cpp | 2 --
src/kernel.hpp | 14 +-------------
src/memory.hpp | 10 ----------
src/program.cpp | 15 +++------------
src/program.hpp | 14 ++------------
src/queue.cpp | 3 +--
10 files changed, 8 insertions(+), 71 deletions(-)
diff --git a/src/api.cpp b/src/api.cpp
index e91fd13..6cda1b0 100644
index 50bb918..f9b7cec 100644
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -488,7 +488,7 @@ cl_int CLVK_API_CALL clGetDeviceInfo(cl_device_id dev,
@ -33,12 +26,12 @@ index e91fd13..6cda1b0 100644
size_ret = sizeof(val_uint);
break;
diff --git a/src/config.def b/src/config.def
index 1fe9ba9..fa33748 100644
index 17716c0..7ab4a8c 100644
--- a/src/config.def
+++ b/src/config.def
@@ -26,8 +26,6 @@ OPTION(uint32_t, log, 0u)
OPTION(bool, log_colour, false)
@@ -27,8 +27,6 @@ OPTION(bool, log_colour, false)
OPTION(std::string, log_dest, "")
OPTION(uint32_t, percentage_of_available_memory_reported, 100u)
OPTION(uint32_t, spirv_validation, 2u)
-OPTION(std::string, spirv_arch, "spir")
-OPTION(bool, physical_addressing, false)
@ -46,7 +39,7 @@ index 1fe9ba9..fa33748 100644
#if COMPILER_AVAILABLE
OPTION(std::string, clspv_options, "")
diff --git a/src/device.cpp b/src/device.cpp
index f8111f3..3df9d3c 100644
index 5040fba..3bf9dd0 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -217,7 +217,6 @@ bool cvk_device::init_extensions() {
@ -77,7 +70,7 @@ index f8111f3..3df9d3c 100644
#undef VER_EXT_FEAT
};
@@ -423,12 +416,6 @@ void cvk_device::init_compiler_options() {
@@ -424,12 +417,6 @@ void cvk_device::init_compiler_options() {
m_device_compiler_options +=
" " + m_clvk_properties->get_compile_options() + " ";
@ -90,7 +83,7 @@ index f8111f3..3df9d3c 100644
// Builtin options
auto native_builtins = m_clvk_properties->get_native_builtins();
if (!native_builtins.empty()) {
@@ -966,8 +953,6 @@ bool cvk_device::supports_capability(spv::Capability capability) const {
@@ -967,8 +954,6 @@ bool cvk_device::supports_capability(spv::Capability capability) const {
return m_features_vulkan_memory_model.vulkanMemoryModel;
case spv::CapabilityShaderNonUniform:
return supports_non_uniform_decoration();
@ -100,10 +93,10 @@ index f8111f3..3df9d3c 100644
default:
cvk_warn_fn("Capability %d not yet mapped to a feature.", capability);
diff --git a/src/device.hpp b/src/device.hpp
index 345d00c..1003500 100644
index 7977b0c..da1d170 100644
--- a/src/device.hpp
+++ b/src/device.hpp
@@ -550,8 +550,6 @@ private:
@@ -557,8 +557,6 @@ private:
m_features_shader_subgroup_extended_types{};
VkPhysicalDeviceVulkanMemoryModelFeaturesKHR
m_features_vulkan_memory_model{};
@ -113,7 +106,7 @@ index 345d00c..1003500 100644
VkDevice m_dev;
std::vector<const char*> m_vulkan_device_extensions;
diff --git a/src/kernel.cpp b/src/kernel.cpp
index bb8f5a6..622b2f8 100644
index bf1ee31..497ec6b 100644
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -325,8 +325,6 @@ bool cvk_kernel_argument_values::setup_descriptor_sets() {
@ -126,7 +119,7 @@ index bb8f5a6..622b2f8 100644
case kernel_argument_kind::local: // nothing to do?
break;
diff --git a/src/kernel.hpp b/src/kernel.hpp
index 33985f2..bef09d4 100644
index 2bb2eab..506e6d1 100644
--- a/src/kernel.hpp
+++ b/src/kernel.hpp
@@ -253,19 +253,7 @@ struct cvk_kernel_argument_values {
@ -172,7 +165,7 @@ index 98df3ca..341da37 100644
bool init();
diff --git a/src/program.cpp b/src/program.cpp
index 215b385..f53067d 100644
index cd0f96a..9109130 100644
--- a/src/program.cpp
+++ b/src/program.cpp
@@ -107,10 +107,6 @@ spv_result_t parse_reflection(void* user_data,
@ -186,7 +179,7 @@ index 215b385..f53067d 100644
case NonSemanticClspvReflectionArgumentSampledImage:
return kernel_argument_kind::sampled_image;
case NonSemanticClspvReflectionArgumentStorageImage:
@@ -243,8 +239,7 @@ spv_result_t parse_reflection(void* user_data,
@@ -244,8 +240,7 @@ spv_result_t parse_reflection(void* user_data,
break;
}
case NonSemanticClspvReflectionArgumentPodStorageBuffer:
@ -196,7 +189,7 @@ index 215b385..f53067d 100644
// These arguments have descriptor set, binding, offset, size
// and an optional arg info.
auto kernel = parse_data->strings[inst->words[5]];
@@ -266,8 +261,7 @@ spv_result_t parse_reflection(void* user_data,
@@ -267,8 +262,7 @@ spv_result_t parse_reflection(void* user_data,
parse_data->binary->add_kernel_argument(kernel, std::move(arg));
break;
}
@ -206,7 +199,7 @@ index 215b385..f53067d 100644
// These arguments have offset, size and an optional arg info.
auto kernel = parse_data->strings[inst->words[5]];
auto ordinal = parse_data->constants[inst->words[6]];
@@ -1484,12 +1478,10 @@ bool cvk_entry_point::build_descriptor_sets_layout_bindings_for_arguments(
@@ -1491,12 +1485,10 @@ bool cvk_entry_point::build_descriptor_sets_layout_bindings_for_arguments(
continue;
case kernel_argument_kind::pod:
case kernel_argument_kind::pod_ubo:
@ -220,16 +213,16 @@ index 215b385..f53067d 100644
dt = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
}
@@ -1501,7 +1493,6 @@ bool cvk_entry_point::build_descriptor_sets_layout_bindings_for_arguments(
@@ -1508,7 +1500,6 @@ bool cvk_entry_point::build_descriptor_sets_layout_bindings_for_arguments(
}
break;
case kernel_argument_kind::pod_pushconstant:
- case kernel_argument_kind::pointer_pushconstant:
case kernel_argument_kind::unused:
continue;
}
diff --git a/src/program.hpp b/src/program.hpp
index 95baac5..cb43aa6 100644
index 34807f2..a02cd5a 100644
--- a/src/program.hpp
+++ b/src/program.hpp
@@ -42,8 +42,6 @@ enum class kernel_argument_kind
@ -241,7 +234,7 @@ index 95baac5..cb43aa6 100644
sampled_image,
storage_image,
sampler,
@@ -77,20 +75,12 @@ struct kernel_argument {
@@ -78,20 +76,12 @@ struct kernel_argument {
bool is_pod() const {
return (kind == kernel_argument_kind::pod) ||
(kind == kernel_argument_kind::pod_ubo) ||

9
packages/clvk/build.sh
View File

@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kpet/clvk
TERMUX_PKG_DESCRIPTION="Experimental implementation of OpenCL on Vulkan"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
_COMMIT=294b05f2be9342e7ecbccb4f8a5d560969407ace
_COMMIT_DATE=20230111
_COMMIT_TIME=164744
TERMUX_PKG_VERSION="0.0.20230111.164744g294b05f2"
TERMUX_PKG_REVISION=2
_COMMIT=9635d8e0c1d3bfe800434b5422c5c49fa6dc638a
_COMMIT_DATE=20230124
_COMMIT_TIME=132813
TERMUX_PKG_VERSION="0.0.20230124.132813g9635d8e0"
TERMUX_PKG_SRCURL=git+https://github.com/kpet/clvk
TERMUX_PKG_GIT_BRANCH=main
TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android"