P4 to Git Change 1174420 by gandryey@gera-dev-w7 on 2015/07/27 16:31:50

ECR #304775 - Merge cal.h, calcl.h and backend.h into backend.h and caltarget.h

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/build/Makefile.apiv08#15 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/build/Makefile.common#32 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/gpu/scwrapper/build/Makefile.scwrapper#29 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/complibdefs#41 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/amuabi/build/Makefile.amuabi#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/bifinternal.hpp#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/bif/build/Makefile.bif#21 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.hpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/build/Makefile.gpu#65 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#122 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/include/cal/cal.h#36 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/include/cal/calcl.h#33 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/EventQueue.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#47 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.h#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/build/Makefile.backend#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/caltarget.h#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/inifile/build/Makefile.inifile#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/inifile/inifile.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/inifile/inifile.h#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/inifile/inifile_parser.h#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/runtimedefs#34 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/build/Makefile.binary#18 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/build/Makefile.complib#36 edit
This commit is contained in:
foreman
2015-07-27 16:42:49 -04:00
parent 9aae2d989d
commit cb74d9528f
13 changed files with 292 additions and 537 deletions
+1 -3
View File
@@ -56,9 +56,7 @@ GCPPFLAGS += $(DEFSWITCH) "BREAK_ON_LOG_WARNING=0"
GCPPFLAGS += $(DEFSWITCH) "BREAK_ON_LOG_ERROR=0"
GCPPFLAGS += $(DEFSWITCH) "LOG_LEVEL=2"
export CAL_INCLUDES = $(OPENCL_DEPTH)/runtime/device/gpu/gslbe/src/include/cal
GCPPFLAGS += $(INCSWITCH) "$(CAL_INCLUDES)"
GCPPFLAGS += $(INCSWITCH) "$(CAL_INCLUDES)/private"
GCPPFLAGS += $(INCSWITCH) "$(OPENCL_DEPTH)/runtime/device/gpu/gslbe/src/rt"
GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/pele/include/asic"
GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/evergreen/include/asic"
GCPPFLAGS += $(INCSWITCH) "$(UGL_DEPTH)/gl/gs/hwl/si/include/asic"
+1 -1
View File
@@ -8,7 +8,7 @@
#include "top.hpp"
#include "elf_utils.hpp"
#include "cal.h" // using CALtargetEnum
#include "caltarget.h" // using CALtargetEnum
#include "libelf.h"
#include "gelf.h"