Commit Graph

54851 Commits

Author SHA1 Message Date
Chris Kitching 4ba2b2e5b8 Inline a redundant std::vector
Looks like a partial refactor..?
2017-10-19 14:11:25 +01:00
Chris Kitching ddd6304971 Allow user-provided -std=* argument to override the default
This means any user-provided -std=* argument overrides this one,
allowing use of newer standards.


[ROCm/clr commit: 90b04f696b]
2017-10-19 14:11:15 +01:00
Chris Kitching 90b04f696b Allow user-provided -std=* argument to override the default
This means any user-provided -std=* argument overrides this one,
allowing use of newer standards.
2017-10-19 14:11:15 +01:00
Chris Kitching 742526706b Allow user-provided -std=* argument to override the default
This means any user-provided -std=* argument overrides this one,
allowing use of newer standards.
2017-10-19 14:11:15 +01:00
Chris Kitching c3f743a763 Add [[nodiscard]] attribute to hipError_t in C++17 mode
This will yield a compiler warning any time you discard an error
return value from an API call.


[ROCm/clr commit: 939fa02ade]
2017-10-19 13:34:02 +01:00
Chris Kitching 939fa02ade Add [[nodiscard]] attribute to hipError_t in C++17 mode
This will yield a compiler warning any time you discard an error
return value from an API call.
2017-10-19 13:34:02 +01:00
Chris Kitching 1d205ab130 Add [[nodiscard]] attribute to hipError_t in C++17 mode
This will yield a compiler warning any time you discard an error
return value from an API call.
2017-10-19 13:34:02 +01:00
foreman 8170a3f003 P4 to Git Change 1472384 by lmoriche@lmoriche_opencl_dev2 on 2017/10/19 03:29:10
SWDEV-126884 - OCL 2.1 Platform APIs
	- Fix OCL/ROCm OpenCL C version

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpucompiler.cpp#157 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#578 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#240 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#65 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/runtimedefs#46 edit


[ROCm/clr commit: 46dcd95add]
2017-10-19 03:34:06 -04:00
foreman 46dcd95add P4 to Git Change 1472384 by lmoriche@lmoriche_opencl_dev2 on 2017/10/19 03:29:10
SWDEV-126884 - OCL 2.1 Platform APIs
	- Fix OCL/ROCm OpenCL C version

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpucompiler.cpp#157 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#578 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#240 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#65 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/runtimedefs#46 edit
2017-10-19 03:34:06 -04:00
foreman 470248bbc2 P4 to Git Change 1472367 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/19 03:00:07
SWDEV-2 - Change OpenCL version number from 2522 to 2523.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2270 edit


[ROCm/clr commit: 04f538b5e6]
2017-10-19 03:07:51 -04:00
foreman 04f538b5e6 P4 to Git Change 1472367 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/19 03:00:07
SWDEV-2 - Change OpenCL version number from 2522 to 2523.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2270 edit
2017-10-19 03:07:51 -04:00
Siu Chi Chan 5ccf3d4d9b hipDeviceReset(): make sure to reinitialize the printf buffer in hcc RT
[ROCm/clr commit: a1956f64e6]
2017-10-18 16:26:13 -04:00
Siu Chi Chan a1956f64e6 hipDeviceReset(): make sure to reinitialize the printf buffer in hcc RT 2017-10-18 16:26:13 -04:00
Siu Chi Chan ccef1cbd6e hipDeviceReset(): make sure to reinitialize the printf buffer in hcc RT 2017-10-18 16:26:13 -04:00
Evgeny Mankov af78943d2c Merge pull request #210 from ChrisKitching/output-hipify
[HIPIFY] Alter output file behaviour slightly

[ROCm/clr commit: 6cfa73a7da]
2017-10-18 21:46:31 +03:00
Evgeny Mankov 6cfa73a7da Merge pull request #210 from ChrisKitching/output-hipify
[HIPIFY] Alter output file behaviour slightly
2017-10-18 21:46:31 +03:00
Evgeny Mankov db7661ccad Merge pull request #210 from ChrisKitching/output-hipify
[HIPIFY] Alter output file behaviour slightly
2017-10-18 21:46:31 +03:00
Chris Kitching bbc7a86d2c Unconditionally append .hip as the default output filename
[ROCm/clr commit: dbbd6d576d]
2017-10-18 19:19:18 +01:00
Chris Kitching dbbd6d576d Unconditionally append .hip as the default output filename 2017-10-18 19:19:18 +01:00
Chris Kitching 296c5a33ce Unconditionally append .hip as the default output filename 2017-10-18 19:19:18 +01:00
foreman 0e8d266551 P4 to Git Change 1472044 by lmoriche@lmoriche_opencl_dev2 on 2017/10/18 12:47:26
SWDEV-126884 - OCL 2.1 Platform APIs
	- Report the OpenCL 2.1 platform on staging

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#20 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#163 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/build/Makefile.headers#6 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/irif/build/Makefile.irif#8 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ockl/build/Makefile.ockl#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/oclc/build/Makefile.oclc#11 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ocml/build/Makefile.ocml#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/opencl/build/Makefile.opencl#13 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#217 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#149 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#357 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#35 edit


[ROCm/clr commit: 33724edae7]
2017-10-18 13:13:31 -04:00
foreman 33724edae7 P4 to Git Change 1472044 by lmoriche@lmoriche_opencl_dev2 on 2017/10/18 12:47:26
SWDEV-126884 - OCL 2.1 Platform APIs
	- Report the OpenCL 2.1 platform on staging

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#20 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#163 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/build/Makefile.headers#6 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/irif/build/Makefile.irif#8 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ockl/build/Makefile.ockl#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/oclc/build/Makefile.oclc#11 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ocml/build/Makefile.ocml#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/opencl/build/Makefile.opencl#13 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#217 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#149 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#357 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#35 edit
2017-10-18 13:13:31 -04:00
foreman 0f83e19fe9 P4 to Git Change 1472044 by lmoriche@lmoriche_opencl_dev2 on 2017/10/18 12:47:26
SWDEV-126884 - OCL 2.1 Platform APIs
	- Report the OpenCL 2.1 platform on staging

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#20 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#163 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/build/Makefile.headers#6 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/irif/build/Makefile.irif#8 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ockl/build/Makefile.ockl#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/oclc/build/Makefile.oclc#11 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ocml/build/Makefile.ocml#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/opencl/build/Makefile.opencl#13 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#217 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#149 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#357 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#35 edit


[ROCm/clr commit: 42cf9abb5e]
2017-10-18 13:13:31 -04:00
foreman 42cf9abb5e P4 to Git Change 1472044 by lmoriche@lmoriche_opencl_dev2 on 2017/10/18 12:47:26
SWDEV-126884 - OCL 2.1 Platform APIs
	- Report the OpenCL 2.1 platform on staging

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#20 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#163 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/build/Makefile.headers#6 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/irif/build/Makefile.irif#8 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ockl/build/Makefile.ockl#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/oclc/build/Makefile.oclc#11 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ocml/build/Makefile.ocml#9 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/opencl/build/Makefile.opencl#13 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#217 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#149 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#357 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#24 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#35 edit
2017-10-18 13:13:31 -04:00
foreman c130d4ca6b P4 to Git Change 1471997 by lmoriche@lmoriche_opencl_dev2 on 2017/10/18 11:30:15
SWDEV-132888 - OCL kernel execution time is long at the first run on Linux, Vega, HSAIL (ProRender unit test)
	Don't finalize ISA binaries if recompilation is not requested.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#74 edit


[ROCm/clr commit: d53d7be489]
2017-10-18 11:39:33 -04:00
foreman d53d7be489 P4 to Git Change 1471997 by lmoriche@lmoriche_opencl_dev2 on 2017/10/18 11:30:15
SWDEV-132888 - OCL kernel execution time is long at the first run on Linux, Vega, HSAIL (ProRender unit test)
	Don't finalize ISA binaries if recompilation is not requested.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#74 edit
2017-10-18 11:39:33 -04:00
Jenkins dffb859a90 Merge 'master' into 'amd-master'
Change-Id: I11589b3fff3bb58717f4f6d7045245815bbdf0cc


[ROCm/clr commit: 3bcd5d3fe3]
2017-10-18 04:11:00 -05:00
Jenkins 3bcd5d3fe3 Merge 'master' into 'amd-master'
Change-Id: I11589b3fff3bb58717f4f6d7045245815bbdf0cc
2017-10-18 04:11:00 -05:00
Jenkins 2a719cd240 Merge 'master' into 'amd-master'
Change-Id: I11589b3fff3bb58717f4f6d7045245815bbdf0cc
2017-10-18 04:11:00 -05:00
foreman a7e2de5d91 P4 to Git Change 1471770 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/18 03:00:57
SWDEV-2 - Change OpenCL version number from 2521 to 2522.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2269 edit


[ROCm/clr commit: ce8ed40695]
2017-10-18 03:10:53 -04:00
foreman ce8ed40695 P4 to Git Change 1471770 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/18 03:00:57
SWDEV-2 - Change OpenCL version number from 2521 to 2522.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2269 edit
2017-10-18 03:10:53 -04:00
Evgeny Mankov 040133beb5 Merge pull request #195 from emankov/master
[HIPIFY] CUDA RT Textures and Arrays support update
[HIPIFY] cmake changes
[HIPIFY][#199][Partial fix] Fix for cudaLaunchKernel transformation 


[ROCm/clr commit: 69b1b91311]
2017-10-17 18:21:28 +03:00
Evgeny Mankov 69b1b91311 Merge pull request #195 from emankov/master
[HIPIFY] CUDA RT Textures and Arrays support update
[HIPIFY] cmake changes
[HIPIFY][#199][Partial fix] Fix for cudaLaunchKernel transformation
2017-10-17 18:21:28 +03:00
Evgeny Mankov e8de9dda33 Merge pull request #195 from emankov/master
[HIPIFY] CUDA RT Textures and Arrays support update
[HIPIFY] cmake changes
[HIPIFY][#199][Partial fix] Fix for cudaLaunchKernel transformation
2017-10-17 18:21:28 +03:00
foreman 081b463151 P4 to Git Change 1471146 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/17 03:00:04
SWDEV-2 - Change OpenCL version number from 2520 to 2521.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2268 edit


[ROCm/clr commit: 0702d1b040]
2017-10-17 03:08:26 -04:00
foreman 0702d1b040 P4 to Git Change 1471146 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/17 03:00:04
SWDEV-2 - Change OpenCL version number from 2520 to 2521.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2268 edit
2017-10-17 03:08:26 -04:00
Yong Zhao 3b852b4437 Add SVM aperture on gfx902
Because of HW design change, GPUVM aperture is no longer needed on GFX9
APUs. However, on APUs some functionalities still depend on GPUVM
aperture, so we choose to use SVM aperture instead to assume
the functionality of previous GPUVM aperture.

Change-Id: Ife7f0d598dd7989f2bcf7cdf3466d5a68703ca60
Signed-off-by: Yong Zhao <yong.zhao@amd.com>
2017-10-16 15:06:09 -04:00
Yong Zhao e5784493c7 Add SVM aperture on gfx902
Because of HW design change, GPUVM aperture is no longer needed on GFX9
APUs. However, on APUs some functionalities still depend on GPUVM
aperture, so we choose to use SVM aperture instead to assume
the functionality of previous GPUVM aperture.

Change-Id: Ife7f0d598dd7989f2bcf7cdf3466d5a68703ca60
Signed-off-by: Yong Zhao <yong.zhao@amd.com>


[ROCm/ROCR-Runtime commit: 3b852b4437]
2017-10-16 15:06:09 -04:00
Chris Kitching 756aca43f9 If an output path is given _use it_
Don't append .hip to a user-provided output file...


[ROCm/clr commit: 14061bf0e6]
2017-10-16 17:32:57 +01:00
Chris Kitching 14061bf0e6 If an output path is given _use it_
Don't append .hip to a user-provided output file...
2017-10-16 17:32:57 +01:00
Chris Kitching e4e17a56bb If an output path is given _use it_
Don't append .hip to a user-provided output file...
2017-10-16 17:32:57 +01:00
Chris Kitching 40b7c1f9a1 Operate on a temp file in-place
This copies to the output after operation, instead of working
_on_ the output. This allows includes to work correctly, while
supporting output paths anywhere on the filesystem.

Fixes #208
Fixes #206


[ROCm/clr commit: bd8a90a05b]
2017-10-16 17:32:56 +01:00
Chris Kitching bd8a90a05b Operate on a temp file in-place
This copies to the output after operation, instead of working
_on_ the output. This allows includes to work correctly, while
supporting output paths anywhere on the filesystem.

Fixes #208
Fixes #206
2017-10-16 17:32:56 +01:00
Chris Kitching 2263cb9f72 Operate on a temp file in-place
This copies to the output after operation, instead of working
_on_ the output. This allows includes to work correctly, while
supporting output paths anywhere on the filesystem.

Fixes #208
Fixes #206
2017-10-16 17:32:56 +01:00
foreman 31657b9996 P4 to Git Change 1470466 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/16 03:00:05
SWDEV-2 - Change OpenCL version number from 2519 to 2520.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2267 edit


[ROCm/clr commit: a423364ee7]
2017-10-16 03:06:39 -04:00
foreman a423364ee7 P4 to Git Change 1470466 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/16 03:00:05
SWDEV-2 - Change OpenCL version number from 2519 to 2520.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2267 edit
2017-10-16 03:06:39 -04:00
foreman 7509db20db P4 to Git Change 1470428 by kzhuravl@kzhuravl-fiji-ocllc on 2017/10/16 01:46:27
SWDEV-125823 - Fix perforce opencl/rocm build

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#28 edit


[ROCm/clr commit: ff21b677d8]
2017-10-16 01:52:40 -04:00
foreman ff21b677d8 P4 to Git Change 1470428 by kzhuravl@kzhuravl-fiji-ocllc on 2017/10/16 01:46:27
SWDEV-125823 - Fix perforce opencl/rocm build

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#28 edit
2017-10-16 01:52:40 -04:00
foreman ec661966e2 P4 to Git Change 1470070 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/14 03:00:22
SWDEV-2 - Change OpenCL version number from 2518 to 2519.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2266 edit


[ROCm/clr commit: c48579eda1]
2017-10-14 03:16:12 -04:00
foreman c48579eda1 P4 to Git Change 1470070 by johtaylo@johtaylo-jtincrementor2-increment on 2017/10/14 03:00:22
SWDEV-2 - Change OpenCL version number from 2518 to 2519.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2266 edit
2017-10-14 03:16:12 -04:00