augustin64/tipe
1
1
Fork 0
mirror of https://github.com/augustin64/projet-tipe synced 2025-01-24 07:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for errors

Browse Source
This commit is contained in:
augustin64 2023-03-30 18:08:31 +02:00
parent 2ee1bc4079
commit 953c92ac61
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/memory_management.c
View File

@ -5,6 +5,7 @@
#include "include/memory_management.h" #include "include/memory_management.h"
#include "include/colors.h" #include "include/colors.h"
#include "include/utils.h"
Memory* memory = NULL; Memory* memory = NULL;
@ -56,6 +57,9 @@ Memory* create_memory_block(size_t size) {
Memory* mem = (Memory*)malloc(sizeof(Memory)); Memory* mem = (Memory*)malloc(sizeof(Memory));
#ifdef __CUDACC__ #ifdef __CUDACC__
cudaMallocManaged(&(mem->start), size, cudaMemAttachHost); cudaMallocManaged(&(mem->start), size, cudaMemAttachHost);
gpuErrchk( cudaPeekAtLastError() );
gpuErrchk( cudaDeviceSynchronize() );
#else #else
mem->start = malloc(size); mem->start = malloc(size);
#endif #endif
@ -93,6 +97,7 @@ void* allocate_memory(int nb_elements, size_t size, Memory* mem) {
//printf("Mémoire disponible: %ld. Nécessaire: %ld\n", mem->size - ((intptr_t)mem->cursor - (intptr_t)mem->start), nb_elements*size); //printf("Mémoire disponible: %ld. Nécessaire: %ld\n", mem->size - ((intptr_t)mem->cursor - (intptr_t)mem->start), nb_elements*size);
// Sinon on continue sur l'élément suivant de la liste // Sinon on continue sur l'élément suivant de la liste
if (!mem->next) { if (!mem->next) {
//! WARNING: May cause Infinite allocations when trying to allocate more than MEMORY_BLOCK size at once that is not naturally aligned (CUDA only)
mem->next = create_memory_block(MEMORY_BLOCK < nb_elements*size ? nb_elements*size : MEMORY_BLOCK); mem->next = create_memory_block(MEMORY_BLOCK < nb_elements*size ? nb_elements*size : MEMORY_BLOCK);
} }
return allocate_memory(nb_elements, size, mem->next); return allocate_memory(nb_elements, size, mem->next);

4
src/memory_management.cu
View File

@ -5,6 +5,7 @@
#include "include/memory_management.h" #include "include/memory_management.h"
#include "include/colors.h" #include "include/colors.h"
#include "include/utils.h"
Memory* memory = NULL; Memory* memory = NULL;
@ -56,6 +57,9 @@ Memory* create_memory_block(size_t size) {
Memory* mem = (Memory*)malloc(sizeof(Memory)); Memory* mem = (Memory*)malloc(sizeof(Memory));
#ifdef __CUDACC__ #ifdef __CUDACC__
cudaMallocManaged(&(mem->start), size, cudaMemAttachHost); cudaMallocManaged(&(mem->start), size, cudaMemAttachHost);
gpuErrchk( cudaPeekAtLastError() );
gpuErrchk( cudaDeviceSynchronize() );
#else #else
mem->start = malloc(size); mem->start = malloc(size);
#endif #endif