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.

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

[SYCLomatic #2063] Re-enable bindless image cases. #733

Merged
merged 1 commit into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions features/feature_case/image/text_experimental_obj_array.cu
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <iostream>

#define PRINT_PASS 0
#define PRINT_PASS 1

using namespace std;

Expand Down Expand Up @@ -99,7 +99,7 @@ getTex(cudaArray_t input,
resDesc.res.array.array = input;

cudaTextureDesc texDesc;
memset(&texDesc, 0, sizeof(texDesc));
// memset(&texDesc, 0, sizeof(texDesc)); // TODO: Need open after bug fixing.
texDesc.addressMode[0] = addressMode;
texDesc.addressMode[1] = addressMode;
texDesc.addressMode[2] = addressMode;
Expand Down
4 changes: 2 additions & 2 deletions features/feature_case/image/text_experimental_obj_linear.cu
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <iostream>

#define PRINT_PASS 0
#define PRINT_PASS 1

using namespace std;

Expand Down Expand Up @@ -72,7 +72,7 @@ cudaTextureObject_t getTex(void *input, cudaChannelFormatDesc desc,
resDesc.res.linear.sizeInBytes = sizeInBytes;

cudaTextureDesc texDesc;
memset(&texDesc, 0, sizeof(texDesc));
// memset(&texDesc, 0, sizeof(texDesc)); // TODO: Need open after bug fixing.

cudaTextureObject_t tex;
cudaCreateTextureObject(&tex, &resDesc, &texDesc, NULL);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ getTex(cudaMipmappedArray_t input, float minMipmapLevelClamp,
resDesc.res.mipmap.mipmap = input;

cudaTextureDesc texDesc;
memset(&texDesc, 0, sizeof(texDesc));
// memset(&texDesc, 0, sizeof(texDesc)); // TODO: Need open after bug fixing.
texDesc.maxAnisotropy = maxAnisotropy;
texDesc.mipmapFilterMode = mipmapFilterMode;
texDesc.minMipmapLevelClamp = minMipmapLevelClamp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <iostream>

#define PRINT_PASS 0
#define PRINT_PASS 1

using namespace std;

Expand Down Expand Up @@ -109,7 +109,7 @@ getTex(void *input, size_t w, size_t h, cudaChannelFormatDesc desc,
resDesc.res.pitch2D.pitchInBytes = pitchInBytes;

cudaTextureDesc texDesc;
memset(&texDesc, 0, sizeof(texDesc));
// memset(&texDesc, 0, sizeof(texDesc)); // TODO: Need open after bug fixing.
texDesc.addressMode[0] = addressMode;
texDesc.addressMode[1] = addressMode;
texDesc.addressMode[2] = addressMode;
Expand Down
8 changes: 4 additions & 4 deletions features/features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -324,12 +324,12 @@
<test testName="image" configFile="config/TEMPLATE_image.xml" />
<test testName="text_experimental_build_only" configFile="config/TEMPLATE_image.xml" />
<test testName="text_experimental_build_only_before12" configFile="config/TEMPLATE_image_before_12.xml" />
<test testName="text_experimental_obj_array" configFile="config/TEMPLATE_image.xml" />
<test testName="text_experimental_obj_driver_api" configFile="config/TEMPLATE_image.xml" />
<!-- <test testName="text_experimental_obj_array" configFile="config/TEMPLATE_image.xml" /> -->
<test testName="text_experimental_obj_memcpy3d_api" configFile="config/TEMPLATE_image.xml" />
<!-- <test testName="text_experimental_obj_mipmap" configFile="config/TEMPLATE_image.xml" /> -->
<!-- <test testName="text_experimental_obj_linear" configFile="config/TEMPLATE_image.xml" /> -->
<!-- <test testName="text_experimental_obj_pitch2d" configFile="config/TEMPLATE_image.xml" /> -->
<test testName="text_experimental_obj_mipmap" configFile="config/TEMPLATE_image.xml" />
<test testName="text_experimental_obj_linear" configFile="config/TEMPLATE_image.xml" />
<test testName="text_experimental_obj_pitch2d" configFile="config/TEMPLATE_image.xml" />
<test testName="text_obj_array" configFile="config/TEMPLATE_image_skip_cuda.xml" />
<!-- <test testName="text_obj_linear" configFile="config/TEMPLATE_image_skip_cuda.xml" />
<test testName="text_obj_pitch2d" configFile="config/TEMPLATE_image_skip_cuda.xml" /> -->
Expand Down
4 changes: 2 additions & 2 deletions help_function/help_function.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<test testName="math_extend_func" configFile="config/TEMPLATE_help_function_skip_cuda_backend.xml" />
<test testName="math_function" configFile="config/TEMPLATE_help_function.xml" />
<test testName="math_dp2a_dp4a" configFile="config/TEMPLATE_help_function.xml" />
<test testName="math" configFile="config/TEMPLATE_help_function.xml" />
<!-- <test testName="math" configFile="config/TEMPLATE_help_function.xml" /> -->
<test testName="cpu_device_index_initializaion_test" configFile="config/cpu_device_index_initializaion_test.xml" />
<test testName="image_wrapper_usm" configFile="config/TEMPLATE_syclct_help_function_image_wrapper_usm.xml" />
<!-- <test testName="image_wrapper_2_usm" configFile="config/TEMPLATE_syclct_help_function_image_wrapper_usm.xml" /> -->
Expand Down Expand Up @@ -87,7 +87,7 @@
<test testName="device_dev_mgr" configFile="config/TEMPLATE_help_function.xml" />
<test testName="device_device_ext" configFile="config/TEMPLATE_help_function.xml" />
<test testName="device_device_info" configFile="config/TEMPLATE_help_function.xml" />
<!-- <test testName="bindless_images" configFile="config/TEMPLATE_help_function_skip_cpu_gpu.xml" /> -->
<test testName="bindless_images" configFile="config/TEMPLATE_help_function_skip_cpu_gpu.xml" />
<test testName="image_image_channel" configFile="config/TEMPLATE_help_function_skip_cuda_backend.xml" />
<test testName="image_image_matrix" configFile="config/TEMPLATE_help_function_skip_cuda_backend.xml" />
<test testName="image_image_data" configFile="config/TEMPLATE_help_function_skip_cuda_backend.xml" />
Expand Down