Commit 1a12d989 authored by Brice Videau's avatar Brice Videau
Browse files

Updated for cuda 11.0.3.

parent 47083289
Pipeline #11831 failed with stage
......@@ -225,17 +225,17 @@ nodist_libTracerCUDART_la_SOURCES = \
libTracerCUDART_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(srcdir)/include -I../utils -I./
libTracerCUDART_la_CFLAGS = -Wall -Wextra -Werror $(LIBFFI_CFLAGS) $(LTTNG_UST_CFLAGS)
libTracerCUDART_la_LDFLAGS = $(LTTNG_UST_LIBS) -ldl -lpthread $(LIBFFI_LIBS)
libTracerCUDART_la_LDFLAGS += -version-number 10:1:0
libTracerCUDART_la_LDFLAGS += -version-number 11:0:3
libTracerCUDART_la_LIBADD = libcudarttracepoints.la
install-exec-hook::
mkdir -p $(pkglibdir)
mkdir -p $(pkglibdir)/cuda
mkdir -p $(pkglibdir)/cudart
$(RM) $(pkglibdir)/cudart/libcudart.so.10.1 $(pkglibdir)/cudart/libcudart.so
$(RM) $(pkglibdir)/cudart/libcudart.so.11.0 $(pkglibdir)/cudart/libcudart.so
$(RM) $(pkglibdir)/cuda/libcuda.so.1 $(pkglibdir)/cuda/libcuda.so
ln -s $(libdir)/libTracerCUDART.so.10.1.0 $(pkglibdir)/cudart/libcudart.so.10.1
ln -s $(pkglibdir)/cudart/libcudart.so.10.1 $(pkglibdir)/cudart/libcudart.so
ln -s $(libdir)/libTracerCUDART.so.11.0.3 $(pkglibdir)/cudart/libcudart.so.11.0
ln -s $(pkglibdir)/cudart/libcudart.so.11.0 $(pkglibdir)/cudart/libcudart.so
ln -s $(libdir)/libTracerCUDA.so.1.0.0 $(pkglibdir)/cuda/libcuda.so.1
ln -s $(pkglibdir)/cuda/libcuda.so.1 $(pkglibdir)/cuda/libcuda.so
......
......@@ -21,6 +21,7 @@ meta_parameters:
- [OutScalar, bytes]
cuDeviceGetAttribute:
- [OutScalar, pi]
# cuDeviceGetNvSciSyncAttributes
cuDeviceGetProperties:
- [OutScalar, prop]
cuDeviceComputeCapability:
......@@ -225,6 +226,27 @@ meta_parameters:
- [OutScalar, pHandle]
cuMipmappedArrayGetLevel:
- [OutScalar, pLevelArray]
cuMemAddressReserve:
- [OutScalar, ptr]
cuMemCreate:
- [InScalar, prop]
- [OutScalar, handle]
cuMemSetAccess:
- [InScalar, desc]
cuMemGetAccess:
- [InScalar, location]
- [OutScalar, flags]
# cuMemExportToShareableHandle
cuMemImportFromShareableHandle:
- [OutScalar, handle]
# - missing osHandle
cuMemGetAllocationGranularity:
- [InScalar, prop]
- [OutScalar, granularity]
cuMemGetAllocationPropertiesFromHandle:
- [OutScalar, prop]
cuMemRetainAllocationHandle:
- [OutScalar, handle]
cuPointerGetAttribute:
- [OutLTTng, data, ctf_sequence_text, uint8_t, data_val, data, size_t, "attribute == CU_POINTER_ATTRIBUTE_CONTEXT ? sizeof(CUcontext) : attribute == CU_POINTER_ATTRIBUTE_MEMORY_TYPE ? sizeof(unsigned int) : attribute == CU_POINTER_ATTRIBUTE_DEVICE_POINTER ? sizeof(CUdeviceptr) : attribute == CU_POINTER_ATTRIBUTE_HOST_POINTER ? sizeof(void *) : attribute == CU_POINTER_ATTRIBUTE_P2P_TOKENS ? sizeof(CUDA_POINTER_ATTRIBUTE_P2P_TOKENS) : attribute == CU_POINTER_ATTRIBUTE_SYNC_MEMOPS ? sizeof(uint8_t) : attribute == CU_POINTER_ATTRIBUTE_BUFFER_ID ? sizeof(unsigned long long) : attribute == CU_POINTER_ATTRIBUTE_IS_MANAGED ? sizeof(uint8_t) : attribute == CU_POINTER_ATTRIBUTE_DEVICE_ORDINAL ? sizeof(int) : 0"]
cuMemRangeGetAttribute:
......@@ -242,6 +264,14 @@ meta_parameters:
- [OutScalar, phStream]
cuStreamCreateWithPriority:
- [OutScalar, phStream]
cuStreamGetAttribute:
- [OutScalar, value]
cuStreamGetAttribute_ptsz:
- [OutScalar, value_out]
cuStreamSetAttribute:
- [InScalar, param]
cuStreamSetAttribute_ptsz:
- [InScalar, value]
cuStreamGetPriority:
- [OutScalar, priority]
cuStreamGetPriority_ptsz:
......@@ -305,6 +335,8 @@ meta_parameters:
- [InArray, paramArray, count]
cuFuncGetAttribute:
- [OutScalar, pi]
cuFuncGetModule:
- [OutScalar, hmod]
cuLaunchKernel:
- [InNullArray, extra]
cuLaunchKernel_ptsz:
......@@ -391,6 +423,19 @@ meta_parameters:
- [OutArray, logBuffer, bufferSize]
cuGraphExecKernelNodeSetParams:
- [InScalar, nodeParams]
cuGraphExecMemcpyNodeSetParams:
- [InScalar, copyParams]
cuGraphExecMemsetNodeSetParams:
- [InScalar, memsetParams]
cuGraphExecHostNodeSetParams:
- [InScalar, nodeParams]
cuGraphExecUpdate:
- [OutScalar, hErrorNode_out]
- [OutScalar, updateResult_out]
cuGraphKernelNodeGetAttribute:
- [OutScalar, value_out]
cuGraphKernelNodeSetAttribute:
- [InScalar, value]
cuOccupancyMaxActiveBlocksPerMultiprocessor:
- [OutScalar, numBlocks]
cuOccupancyMaxActiveBlocksPerMultiprocessorWithFlags:
......@@ -401,6 +446,8 @@ meta_parameters:
cuOccupancyMaxPotentialBlockSizeWithFlags:
- [OutScalar, minGridSize]
- [OutScalar, blockSize]
cuOccupancyAvailableDynamicSMemPerBlock:
- [OutScalar, dynamicSmemSize]
cuTexRefSetAddress:
- [OutScalar, ByteOffset]
cuTexRefSetAddress2D:
......
......@@ -36,8 +36,8 @@ all_types.each { |t|
end
}
CUDA_INT_SCALARS = %w(size_t uint32_t cuuint32_t uint64_t cuuint64_t int short char CUdevice CUdeviceptr CUdeviceptr_v1 CUtexObject CUsurfObject)
CUDA_INT_SCALARS.concat [ "long long", "unsigned long long", "unsigned int", "unsigned short", "unsigned char" ]
CUDA_INT_SCALARS = %w(size_t uint32_t cuuint32_t uint64_t cuuint64_t int short char CUdevice CUdeviceptr CUdeviceptr_v1 CUtexObject CUsurfObject CUmemGenericAllocationHandle)
CUDA_INT_SCALARS.concat [ "long long", "unsigned long long", "unsigned long long int", "unsigned int", "unsigned short", "unsigned char" ]
CUDA_FLOAT_SCALARS = %w(float double)
CUDA_SCALARS = CUDA_INT_SCALARS + CUDA_FLOAT_SCALARS
CUDA_ENUM_SCALARS = all_types.select { |t| t.type.kind_of? YAMLCAst::Enum }.collect { |t| t.name }
......@@ -499,7 +499,7 @@ class ScalarMetaParameter < MetaParameter
super(command, name)
@type = type
a = command[name]
raise "Invalid parameter: #{name} for #{command.name}!" unless a
raise "Invalid parameter: #{name} for #{command.name} #{command.parameters}!" unless a
t = a.type
raise "Type is not a pointer: #{t}!" if !t.kind_of?(YAMLCAst::Pointer)
if type
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -58,7 +58,7 @@
#if !defined(__CUDACC_RTC__)
#if !defined(__CUDACC_RDC__) && !defined(__CUDACC_EWP__) && defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 350) && !defined(__CUDADEVRT_INTERNAL__)
#if !defined(__CUDACC_INTERNAL_NO_STUBS__) && !defined(__CUDACC_RDC__) && !defined(__CUDACC_EWP__) && defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 350) && !defined(__CUDADEVRT_INTERNAL__)
#if defined(__cplusplus)
extern "C" {
......@@ -108,7 +108,7 @@ __device__ __NV_WEAK__ cudaError_t CUDARTAPI cudaOccupancyMaxActiveBlocksPerMult
}
#endif
#endif /* !defined(__CUDACC_RDC__) && !defined(__CUDACC_EWP__) && defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 350) && !defined(__CUDADEVRT_INTERNAL__) */
#endif /* !defined(__CUDACC_INTERNAL_NO_STUBS__) && !defined(__CUDACC_RDC__) && !defined(__CUDACC_EWP__) && defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 350) && !defined(__CUDADEVRT_INTERNAL__) */
#endif /* !defined(__CUDACC_RTC__) */
......
This diff is collapsed.
This diff is collapsed.
......@@ -152,7 +152,11 @@ struct __device_builtin__ textureReference
* Upper end of the mipmap level range to clamp access to
*/
float maxMipmapLevelClamp;
int __cudaReserved[15];
/**
* Disable any trilinear filtering optimizations.
*/
int disableTrilinearOptimization;
int __cudaReserved[14];
};
/**
......@@ -204,6 +208,10 @@ struct __device_builtin__ cudaTextureDesc
* Upper end of the mipmap level range to clamp access to
*/
float maxMipmapLevelClamp;
/**
* Disable any trilinear filtering optimizations.
*/
int disableTrilinearOptimization;
};
/**
......
......@@ -419,11 +419,13 @@ struct __device_builtin__ dim3
#if defined(__cplusplus)
#if __cplusplus >= 201103L
__host__ __device__ constexpr dim3(unsigned int vx = 1, unsigned int vy = 1, unsigned int vz = 1) : x(vx), y(vy), z(vz) {}
__host__ __device__ constexpr dim3(uint3 v) : x(v.x), y(v.y), z(v.z) {}
__host__ __device__ constexpr operator uint3(void) const { return uint3{x, y, z}; }
#else
__host__ __device__ dim3(unsigned int vx = 1, unsigned int vy = 1, unsigned int vz = 1) : x(vx), y(vy), z(vz) {}
#endif
__host__ __device__ dim3(uint3 v) : x(v.x), y(v.y), z(v.z) {}
__host__ __device__ operator uint3(void) { uint3 t; t.x = x; t.y = y; t.z = z; return t; }
__host__ __device__ operator uint3(void) const { uint3 t; t.x = x; t.y = y; t.z = z; return t; }
#endif
#endif /* __cplusplus */
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment