wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Blaise Tine
2020-06-23 14:40:29 -07:00
parent d1103733f5
commit c9c34cb71a
9 changed files with 0 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/qemu/vx_api.c
View File

@@ -1,27 +1,11 @@
#include <stdio.h>
#include <stdlib.h>
<<<<<<< HEAD
=======
#include "../vx_api/vx_api.h"
>>>>>>> fpga_synthesis
#ifdef __cplusplus
extern "C" {
#endif
<<<<<<< HEAD
struct pocl_context_t {
uint32_t num_groups[3];
uint32_t global_offset[3];
uint32_t local_size[3];
uint8_t *printf_buffer;
uint32_t *printf_buffer_position;
uint32_t printf_buffer_capacity;
uint32_t work_dim;
};
=======
>>>>>>> fpga_synthesis
typedef void (*pocl_workgroup_func) (
void * /* args */,
void * /* pocl_context */,
@@ -30,11 +14,7 @@ typedef void (*pocl_workgroup_func) (
uint32_t /* group_z */
);
<<<<<<< HEAD
void pocl_spawn(struct pocl_context_t * ctx, const pocl_workgroup_func pfn, void * arguments) {
=======
void pocl_spawn(struct pocl_context_t * ctx, pocl_workgroup_func pfn, const void * args) {
>>>>>>> fpga_synthesis
uint32_t x, y, z;
for (z = 0; z < ctx->num_groups[2]; ++z)
for (y = 0; y < ctx->num_groups[1]; ++y)