From 8a7798388b2e7d6b7c162f3f5ac46612d7108b75 Mon Sep 17 00:00:00 2001 From: "Andrew M. B. Boktor" Date: Wed, 9 Nov 2011 15:43:50 -0800 Subject: Fixed build fail when there is no opencl Now, you have to define both NVOPENCL_LIBDIR and NVOPENCL_INCDIR in the setupd_environment script to build with opencl. If any of them is not setup, gpgpu-sim will build will output a warning and built without opencl support. [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 10873] --- libopencl/Makefile | 143 ++++++++++++++++++++++++++--------------------------- 1 file changed, 71 insertions(+), 72 deletions(-) (limited to 'libopencl') diff --git a/libopencl/Makefile b/libopencl/Makefile index 0247048..cc3221b 100644 --- a/libopencl/Makefile +++ b/libopencl/Makefile @@ -103,7 +103,7 @@ depend: nvopencl_wrapper: nvopencl_wrapper.cc if [ ! -d bin ]; then mkdir bin; fi - g++ $(CCFLAGS) nvopencl_wrapper.cc -I./ -I$(NVIDIA_CUDA_SDK_LOCATION)/OpenCL/common/inc -L $(NVOPENCL_LIBDIR) -lOpenCL -o bin/nvopencl_wrapper + g++ $(CCFLAGS) nvopencl_wrapper.cc -I./ -I$(NVOPENCL_INCDIR)/ -L $(NVOPENCL_LIBDIR) -lOpenCL -o bin/nvopencl_wrapper OUTPUT_DIR=../$(SIM_OBJ_FILES_DIR)/libopencl @@ -117,74 +117,73 @@ clean: rm -f bin/nvopencl_wrapper # DO NOT DELETE -../build/release/libopencl/opencl_runtime_api.o: /usr/include/stdlib.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/features.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/cdefs.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/wordsize.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs-64.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/types.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/types.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/typesizes.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/time.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/endian.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/endian.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/byteswap.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/select.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/select.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/sigset.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/time.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/sys/sysmacros.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/pthreadtypes.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/alloca.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/stdio.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/libio.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/_G_config.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/wchar.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/stdio_lim.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/sys_errlist.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/string.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/xlocale.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/assert.h -../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/cuda-sim.h -../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_loader.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_ir.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_sim.h -../build/release/libopencl/opencl_runtime_api.o: ../src/tr1_hash_map.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.def -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/memory.h -../build/release/libopencl/opencl_runtime_api.o: ../src/option_parser.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpusim_entrypoint.h -../build/release/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-sim.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/addrdec.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/math.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_val.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_valf.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_vall.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/inf.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/nan.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/mathdef.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/mathcalls.h -../build/release/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/delayqueue.h -../build/release/libopencl/opencl_runtime_api.o: ../src/intersim/statwraper.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-misc.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stack.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/dram.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/zlib.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/zconf.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/unistd.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/posix_opt.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/bits/confname.h -../build/release/libopencl/opencl_runtime_api.o: /usr/include/getopt.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/scoreboard.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/mem_fetch.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stats.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h -../build/release/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/stdlib.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/features.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/cdefs.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/wordsize.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/gnu/stubs-64.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/types.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/types.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/typesizes.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/time.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/endian.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/endian.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/byteswap.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/select.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/select.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/sigset.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/time.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/sys/sysmacros.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/pthreadtypes.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/alloca.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/stdio.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/libio.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/_G_config.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/wchar.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/stdio_lim.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/sys_errlist.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/string.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/assert.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/cuda-sim.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_loader.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_ir.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx_sim.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/tr1_hash_map.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/opcodes.def +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/memory.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/option_parser.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpusim_entrypoint.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/abstract_hardware_model.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-sim.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/addrdec.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/math.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/huge_val.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/mathdef.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/mathcalls.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/cuda-sim/ptx.tab.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/delayqueue.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/intersim/statwraper.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-misc.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stack.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/dram.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/zlib.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/zconf.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/unistd.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/posix_opt.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/confname.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/getopt.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/scoreboard.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/mem_fetch.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/stats.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/gpu-cache.h +../build/debug/libopencl/opencl_runtime_api.o: ../src/gpgpu-sim/shader.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/CL/cl.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/CL/cl_platform.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/stdint.h +../build/debug/libopencl/opencl_runtime_api.o: /usr/include/bits/wchar.h -- cgit v1.3