cma.h is added, and memcpy is updated for cma.

c_lib/cma.h

@@ -0,0 +1,164 @@
+#ifndef CMA_H
+#define CMA_H
+
+#define CMA_SYNC_OFF   (0)
+#define CMA_SYNC_ON    (1)
+#define CMA_SYNC_ON_WC (2)
+#define CMA_SYNC_ON_DC (3)
+
+/* SYNC_MODE:
+ * 0: CPU cache ON (very fast, but no consistent)
+ * 1: CPU cache OFF, O_SYNC (slow)
+ * 2: CPU cache OFF, O_SYNC, Write Combine ON (fast)
+ * 3: CPU cache OFF, O_SYNC, DMA coherent (fast)
+ */
+
+#define DEV_CMA "/dev/udmabuf0"
+#define DEV_CMA_ADDR "/sys/class/udmabuf/udmabuf0/phys_addr"
+#define DEV_CMA_SIZE "/sys/class/udmabuf/udmabuf0/size"
+#define DEV_CMA_SYNC_MODE "/sys/class/udmabuf/udmabuf0/sync_mode"
+#define DEV_CMA_DEBUG_VMA "/sys/class/udmabuf/udmabuf0/debug_vma"
+
+#define CMA_PAGE_SIZE (4*1024)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+
+int fd_cma = -1;
+volatile char* cma_ptr = NULL;
+unsigned int cma_used = 0;
+unsigned int cma_offset = 0;
+unsigned int cma_size = 0;
+
+void cma_check(unsigned int sync_mode, unsigned int* paddr, unsigned int* size)
+{
+  int fd;
+  char attr[1024];
+  unsigned int buf_size;
+  unsigned int phys_addr;
+  /* unsigned int debug_vma = 0; */
+
+  fd = open(DEV_CMA_ADDR, O_RDONLY);
+  if(fd < 0){
+    printf("cma_check(): Cannot open %s\n", DEV_CMA_ADDR);
+    exit(1);
+  }
+  read(fd, attr, 1024);
+  sscanf(attr, "%x", &phys_addr);
+  close(fd);
+
+  fd = open(DEV_CMA_SIZE, O_RDONLY);
+  if(fd < 0){
+    printf("cma_check(): Cannot open %s\n", DEV_CMA_SIZE);
+    exit(1);
+  }
+  read(fd, attr, 1024);
+  sscanf(attr, "%d", &buf_size);
+  close(fd);
+
+  fd = open(DEV_CMA_SYNC_MODE, O_WRONLY);
+  if(fd < 0){
+    printf("cma_check(): Cannot open %s\n", DEV_CMA_SYNC_MODE);
+    exit(1);
+  }
+  sprintf(attr, "%d", sync_mode);
+  write(fd, attr, strlen(attr));
+  close(fd);
+
+  /*
+  fd = open(DEV_CMA_DEBUG_VMA, O_WRONLY);
+  if(fd < 0){
+    printf("cma_check(): Cannot open %s\n", DEV_CMA_DEBUG_VMA);
+    exit(1);
+  }
+  sprintf(attr, "%d", debug_vma);
+  write(fd, attr, strlen(attr));
+  close(fd);
+  */
+
+  *paddr = phys_addr;
+  *size = buf_size;
+}
+
+void cma_open(unsigned int sync_mode)
+{
+  if(sync_mode > CMA_SYNC_ON_DC){
+    sync_mode = CMA_SYNC_ON_DC;
+  }
+
+  unsigned int paddr;
+  unsigned int size;
+  cma_check(sync_mode, &paddr, &size);
+  cma_offset = paddr;
+  cma_size = size;
+
+  if(sync_mode == 0){
+    fd_cma = open(DEV_CMA, O_RDWR);
+  }else{
+    fd_cma = open(DEV_CMA, O_RDWR | O_SYNC);
+  }
+
+  if(fd_cma < 1){
+    printf("cma_open(): Invalid device file: '%s'\n", DEV_CMA);
+    exit(1);
+  }
+  cma_ptr = (volatile char*) mmap(NULL, cma_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd_cma, 0);
+  if(cma_ptr == MAP_FAILED){
+    printf("cma_open(): mmap failed.\n");
+    exit(1);
+  }
+  cma_used = 0;
+}
+
+void* cma_malloc(unsigned int bytes)
+{
+  if(cma_ptr == NULL){
+    printf("cma_malloc(): CMA is not opened.\n");
+    return NULL;
+  }
+
+  unsigned int numpages = bytes / CMA_PAGE_SIZE;
+  if(bytes % CMA_PAGE_SIZE != 0){
+    numpages++;
+  }
+
+  unsigned int size = CMA_PAGE_SIZE*numpages;
+
+  if(cma_used + size > cma_size){
+    return NULL;
+  }
+
+  void* ptr = (void*)(cma_ptr + cma_used);
+  cma_used += size;
+  return ptr;
+}
+
+unsigned int cma_get_physical_address(void* ptr)
+{
+  return cma_offset + ((unsigned int) ptr) - ((unsigned int)cma_ptr);
+}
+
+void cma_cache_clean(char* addr, unsigned int bytes)
+{
+  //__clear_cache(addr, addr + bytes);
+  msync((void*)addr, bytes, MS_SYNC);
+}
+
+void cma_close()
+{
+  if(cma_ptr == NULL){
+    printf("cma_close(): CMA is not opened.\n");
+    return;
+  }
+  munmap((void*) cma_ptr, cma_size);
+  cma_ptr = NULL;
+  close(fd_cma);
+  fd_cma = -1;
+}
+
+#endif

c_lib/pycoram.h

@@ -11,8 +11,8 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 
-int fd_pycoram;
-volatile int* pycoram_ptr;
+int fd_pycoram = -1;
+volatile int* pycoram_ptr = NULL;
 
 void pycoram_open()
 {
@@ -37,7 +37,14 @@ void pycoram_read_4b(unsigned int* data)
 
 void pycoram_close()
 {
+  if(pycoram_ptr == NULL){
+    printf("pycoram_close(): UIO is not opened.\n");
+    return;
+  }
   munmap((void*) pycoram_ptr, PYCORAM_SIZE);
+  pycoram_ptr = NULL;
+  close(fd_pycoram);
+  fd_pycoram = -1;
 }
 
 #endif

c_lib/umem.h

@@ -18,7 +18,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 
-int fd_umem;
+int fd_umem = -1;
 volatile char* umem_ptr = NULL;
 unsigned int umem_used = 0;
 
@@ -74,6 +74,8 @@ void umem_close()
   }
   munmap((void*) umem_ptr, UMEM_SIZE);
   umem_ptr = NULL;
+  close(fd_umem);
+  fd_umem = -1;
 }
 
 #endif

sample/app/dijkstra/software/zynq/pycoram.h

@@ -1,3 +1,6 @@
+#ifndef PYCORAM_H
+#define PYCORAM_H
+
 #define UIO_PYCORAM "/dev/uio1"
 #define PYCORAM_SIZE (0x00001000)
 
@@ -8,8 +11,8 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 
-int fd_pycoram;
-volatile int* pycoram_ptr;
+int fd_pycoram = -1;
+volatile int* pycoram_ptr = NULL;
 
 void pycoram_open()
 {
@@ -34,6 +37,14 @@ void pycoram_read_4b(unsigned int* data)
 
 void pycoram_close()
 {
+  if(pycoram_ptr == NULL){
+    printf("pycoram_close(): UIO is not opened.\n");
+    return;
+  }
   munmap((void*) pycoram_ptr, PYCORAM_SIZE);
+  pycoram_ptr = NULL;
+  close(fd_pycoram);
+  fd_pycoram = -1;
 }
 
+#endif

sample/app/dijkstra/software/zynq/umem.h

@@ -1,6 +1,13 @@
+#ifndef UMEM_H
+#define UMEM_H
+
 #define UIO_MEM "/dev/uio0"
-#define UMEM_SIZE   (0x10000000)
+// ZedBoard (DRAM 512 MB)
+#define UMEM_SIZE (0x10000000)
 #define UMEM_OFFSET (0x10000000)
+// ZC706 (DRAM 1024 MB)
+//#define UMEM_SIZE (0x20000000)
+//#define UMEM_OFFSET (0x20000000)
 
 #define UMEM_PAGE_SIZE (4*1024)
 
@@ -11,7 +18,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 
-int fd_umem;
+int fd_umem = -1;
 volatile char* umem_ptr = NULL;
 unsigned int umem_used = 0;
 
@@ -67,5 +74,8 @@ void umem_close()
   }
   munmap((void*) umem_ptr, UMEM_SIZE);
   umem_ptr = NULL;
+  close(fd_umem);
+  fd_umem = -1;
 }
 
+#endif

sample/test/memcpy/sw-cma/Makefile

@@ -0,0 +1,46 @@
+CC=gcc
+LIB=../../../../c_lib/
+INCLUDE=-I $(LIB)
+OFLAGS=-O3 -g -pg -Wall $(INCLUDE)
+#OFLAGS=-O0 -g -pg -Wall $(INCLUDE)
+SRCS=main.c
+HEADERS=
+OBJS=$(SRCS:.cc=.o)
+TARGET=test.out
+
+all: $(TARGET)
+
+.PHONY: run	
+run:
+	time ./$(TARGET)
+
+$(TARGET): $(OBJS) $(HEADERS)
+	$(CC) $(OFLAGS) $(OBJS) -o $(TARGET)
+
+$(HEADERS): 
+.cc.o:
+	$(CC) $(OFLAGS) -c $<
+
+.PHONY: valgrind
+valgrind:
+	valgrind --leak-check=full ./$(TARGET)
+
+.PHONY: gdb
+gdb:
+	gdb ./$(TARGET)
+
+.PHONY: perf_all
+perf_all:
+	perf stat ./$(TARGET)
+
+.PHONY: perf_detail
+perf_detail:
+	perf stat -e instructions -e branch-instructions -e branch-misses -e cache-references -e cache-misses ./$(TARGET)
+
+.PHONY: prof
+prof:
+	gprof test.out gmon.out
+
+.PHONY: clean
+clean:
+	rm -rf $(TARGET) $(GEN) *.o $(TARGET).dSYM gmon.out