Skip to content

Update to CUDA 12 #26

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

Open
jay-tux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to CUDA 12 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,7 @@ src/cuda/level2/dwt2d/input.bmp.dwt.r
build-aux
configure
*m4

# CLion
cmake-build-*/
.idea/*
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.8)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CUDA_ARCHITECTURES native)

project(Altis LANGUAGES CXX CUDA)

Expand Down
59 changes: 34 additions & 25 deletions src/cuda/level0/devicememory/DeviceMemory.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,39 +125,39 @@ __device__ int getRand(int seed, int mod);
///
/// <remarks> Bodun Hu (bodunhu@utexas.edu), 5/19/2020. </remarks>
///
/// <param name="tex"> The texture. </param>
/// <param name="n"> An int to process. </param>
/// <param name="d_out"> [in,out] If non-null, the out. </param>
/// <param name="width"> The width. </param>
////////////////////////////////////////////////////////////////////////////////////////////////////

__global__ void readTexels(int n, float *d_out, int width);
__global__ void readTexels(cudaTextureObject_t tex, int n, float *d_out, int width);

////////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary> Reads texels in cache. </summary>
///
/// <remarks> Bodun Hu (bodunhu@utexas.edu), 5/19/2020. </remarks>
///
/// <param name="tex"> The texture. </param>
/// <param name="n"> An int to process. </param>
/// <param name="d_out"> [in,out] If non-null, the out. </param>
////////////////////////////////////////////////////////////////////////////////////////////////////

__global__ void readTexelsInCache(int n, float *d_out);
__global__ void readTexelsInCache(cudaTextureObject_t tex, int n, float *d_out);

////////////////////////////////////////////////////////////////////////////////////////////////////
/// <summary> Reads texels random. </summary>
///
/// <remarks> Bodun Hu (bodunhu@utexas.edu), 5/19/2020. </remarks>
///
/// <param name="tex"> The texture. </param>
/// <param name="n"> An int to process. </param>
/// <param name="d_out"> [in,out] If non-null, the out. </param>
/// <param name="width"> The width. </param>
/// <param name="height"> The height. </param>
////////////////////////////////////////////////////////////////////////////////////////////////////

__global__ void readTexelsRandom(int n, float *d_out, int width, int height);
// Texture to use for the benchmarks
/// <summary> The tex a. </summary>
texture<float4, 2, cudaReadModeElementType> texA;
__global__ void readTexelsRandom(cudaTextureObject_t tex, int n, float *d_out, int width, int height);

// ****************************************************************************
// Function: addBenchmarkSpecOptions (From SHOC)
Expand Down Expand Up @@ -456,10 +456,12 @@ void TestTextureMem(ResultDatabase &resultDB, OptionParser &op, double scalet) {
checkCudaErrors(cudaEventCreate(&stop));

// make sure our texture behaves like we want....
texA.normalized = false;
texA.addressMode[0] = cudaAddressModeClamp;
texA.addressMode[1] = cudaAddressModeClamp;
texA.filterMode = cudaFilterModePoint;
cudaTextureDesc texDesc {
.addressMode = { cudaAddressModeClamp, cudaAddressModeClamp },
.filterMode = cudaFilterModePoint,
.normalizedCoords = false
};
cudaChannelFormatDesc formatDesc = cudaCreateChannelDesc<unsigned char>();

for (int j = 0; j < nsizes; j++) {
if(!quiet) {
Expand Down Expand Up @@ -499,15 +501,19 @@ void TestTextureMem(ResultDatabase &resultDB, OptionParser &op, double scalet) {

// Allocate a cuda array
cudaArray *cuArray;
checkCudaErrors(cudaMallocArray(&cuArray, &texA.channelDesc, width, height));
checkCudaErrors(cudaMallocArray(&cuArray, &formatDesc, width, height));

// Copy in source data
//checkCudaErrors(cudaMemcpyToArray(cuArray, 0, 0, h_in, size, cudaMemcpyHostToDevice));

checkCudaErrors(cudaMemcpy2DToArray(cuArray, 0, 0, h_in, width, width, height, cudaMemcpyDefault));

// Bind texture to the array
checkCudaErrors(cudaBindTextureToArray(texA, cuArray));
cudaResourceDesc resource {
.resType = cudaResourceTypeArray,
.res = {
.array = { .array = cuArray }
}
};
cudaTextureObject_t tex;
checkCudaErrors(cudaCreateTextureObject(&tex, &resource, &texDesc, nullptr));

for (int p = 0; p < passes; p++) {
// Test 1: Repeated Linear Access
Expand All @@ -516,7 +522,7 @@ void TestTextureMem(ResultDatabase &resultDB, OptionParser &op, double scalet) {
checkCudaErrors(cudaEventRecord(start, 0));
// read texels from texture
for (int iter = 0; iter < iterations; iter++) {
readTexels<<<gridSize, blockSize>>>(kernelRepFactor, d_out, width);
readTexels<<<gridSize, blockSize>>>(tex, kernelRepFactor, d_out, width);
}
checkCudaErrors(cudaEventRecord(stop, 0));
checkCudaErrors(cudaEventSynchronize(stop));
Expand All @@ -540,7 +546,7 @@ void TestTextureMem(ResultDatabase &resultDB, OptionParser &op, double scalet) {
// Test 2 Repeated Cache Access
checkCudaErrors(cudaEventRecord(start, 0));
for (int iter = 0; iter < iterations; iter++) {
readTexelsInCache<<<gridSize, blockSize>>>(kernelRepFactor, d_out);
readTexelsInCache<<<gridSize, blockSize>>>(tex, kernelRepFactor, d_out);
}
cudaEventRecord(stop, 0);
cudaEventSynchronize(stop);
Expand All @@ -564,7 +570,7 @@ void TestTextureMem(ResultDatabase &resultDB, OptionParser &op, double scalet) {

// read texels from texture
for (int iter = 0; iter < iterations; iter++) {
readTexelsRandom<<<gridSize, blockSize>>>(kernelRepFactor, d_out, width, height);
readTexelsRandom<<<gridSize, blockSize>>>(tex, kernelRepFactor, d_out, width, height);
}

checkCudaErrors(cudaEventRecord(stop, 0));
Expand All @@ -585,7 +591,7 @@ void TestTextureMem(ResultDatabase &resultDB, OptionParser &op, double scalet) {
delete[] h_out;
checkCudaErrors(cudaFree(d_out));
checkCudaErrors(cudaFreeArray(cuArray));
checkCudaErrors(cudaUnbindTexture(texA));
checkCudaErrors(cudaDestroyTextureObject(tex));
}
checkCudaErrors(cudaEventDestroy(start));
checkCudaErrors(cudaEventDestroy(stop));
Expand Down Expand Up @@ -833,19 +839,20 @@ __global__ void writeLocalMemory(float *output, int size, int repeat) {
///
/// <remarks> Bodun Hu (bodunhu@utexas.edu), 5/19/2020. </remarks>
///
/// <param name="tex"> The texture. </param>
/// <param name="n"> An int to process. </param>
/// <param name="d_out"> [in,out] If non-null, the out. </param>
/// <param name="width"> The width. </param>
////////////////////////////////////////////////////////////////////////////////////////////////////

__global__ void readTexels(int n, float *d_out, int width) {
__global__ void readTexels(cudaTextureObject_t tex, int n, float *d_out, int width) {
int idx_x = (blockIdx.x * blockDim.x) + threadIdx.x;
int idx_y = (blockIdx.y * blockDim.y) + threadIdx.y;
int out_idx = idx_y * gridDim.x + idx_x;
float sum = 0.0f;
int width_bits = width - 1;
for (int i = 0; i < n; i++) {
float4 v = tex2D(texA, float(idx_x), float(idx_y));
float4 v = tex2D<float4>(tex, float(idx_x), float(idx_y));
idx_x = (idx_x + 1) & width_bits;
sum += v.x;
}
Expand All @@ -859,17 +866,18 @@ __global__ void readTexels(int n, float *d_out, int width) {
///
/// <remarks> Bodun Hu (bodunhu@utexas.edu), 5/19/2020. </remarks>
///
/// <param name="tex"> The texture. </param>
/// <param name="n"> An int to process. </param>
/// <param name="d_out"> [in,out] If non-null, the out. </param>
////////////////////////////////////////////////////////////////////////////////////////////////////

__global__ void readTexelsInCache(int n, float *d_out) {
__global__ void readTexelsInCache(cudaTextureObject_t tex, int n, float *d_out) {
int idx_x = (blockIdx.x * blockDim.x) + threadIdx.x;
int idx_y = (blockIdx.y * blockDim.y) + threadIdx.y;
int out_idx = idx_y * gridDim.x + idx_x;
float sum = 0.0f;
for (int i = 0; i < n; i++) {
float4 v = tex2D(texA, float(idx_x), float(idx_y));
float4 v = tex2D<float4>(tex, float(idx_x), float(idx_y));
sum += v.x;
}
d_out[out_idx] = sum;
Expand All @@ -882,21 +890,22 @@ __global__ void readTexelsInCache(int n, float *d_out) {
///
/// <remarks> Bodun Hu (bodunhu@utexas.edu), 5/19/2020. </remarks>
///
/// <param name="tex"> The texture. </param>
/// <param name="n"> An int to process. </param>
/// <param name="d_out"> [in,out] If non-null, the out. </param>
/// <param name="width"> The width. </param>
/// <param name="height"> The height. </param>
////////////////////////////////////////////////////////////////////////////////////////////////////

__global__ void readTexelsRandom(int n, float *d_out, int width, int height) {
__global__ void readTexelsRandom(cudaTextureObject_t tex, int n, float *d_out, int width, int height) {
int idx_x = (blockIdx.x * blockDim.x) + threadIdx.x;
int idx_y = (blockIdx.y * blockDim.y) + threadIdx.y;
int out_idx = idx_y * gridDim.x + idx_x;
float sum = 0.0f;
int width_bits = width - 1;
int height_bits = height - 1;
for (int i = 0; i < n; i++) {
float4 v = tex2D(texA, float(idx_x), float(idx_y));
float4 v = tex2D<float4>(tex, float(idx_x), float(idx_y));
idx_x = (idx_x * 3 + 29) & (width_bits);
idx_y = (idx_y * 5 + 11) & (height_bits);
sum += v.x;
Expand Down