76333 Коммитов
Автор SHA1 Сообщение Дата
Alex Voicu f2a86f3e1c Remove vestigial inline LLVMIR. 2018-05-24 12:46:14 +01:00
Alex Voicu a7da1ccf2e Remove vestigial inline LLVMIR.
[ROCm/hip commit: 9c7fbdb597]
2018-05-24 12:46:14 +01:00
Alex Voicu 9c7fbdb597 Remove vestigial inline LLVMIR. 2018-05-24 12:46:14 +01:00
Rahul Garg 4fc64ff4c5 Fix memcpy2d kernel dims
[ROCm/clr commit: 53a7c61e9b]
2018-05-24 17:00:12 +05:30
Rahul Garg 53a7c61e9b Fix memcpy2d kernel dims 2018-05-24 17:00:12 +05:30
Rahul Garg fb745baa7e Fix memcpy2d kernel dims
[ROCm/hip commit: 981e56a68f]
2018-05-24 17:00:12 +05:30
Rahul Garg 981e56a68f Fix memcpy2d kernel dims 2018-05-24 17:00:12 +05:30
foreman cb8920b5e3 P4 to Git Change 1558894 by johtaylo@johtaylo-jtincrementor2-increment on 2018/05/24 03:00:04
SWDEV-2 - Change OpenCL version number from 2660 to 2661.

Affected files ...

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


[ROCm/clr commit: a245f46203]
2018-05-24 03:11:44 -04:00
foreman a245f46203 P4 to Git Change 1558894 by johtaylo@johtaylo-jtincrementor2-increment on 2018/05/24 03:00:04
SWDEV-2 - Change OpenCL version number from 2660 to 2661.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2408 edit
2018-05-24 03:11:44 -04:00
Rahul Garg 4e52a634a1 Correct remaining bytes in copy 2d kernel
[ROCm/clr commit: 96b4618d26]
2018-05-24 08:27:24 +05:30
Rahul Garg 96b4618d26 Correct remaining bytes in copy 2d kernel 2018-05-24 08:27:24 +05:30
Rahul Garg fb1425959e Correct remaining bytes in copy 2d kernel
[ROCm/hip commit: dc179e0c33]
2018-05-24 08:27:24 +05:30
Rahul Garg dc179e0c33 Correct remaining bytes in copy 2d kernel 2018-05-24 08:27:24 +05:30
foreman 8b4b912c3f P4 to Git Change 1558704 by gandryey@gera-w8 on 2018/05/23 17:20:01
SWDEV-79445 - OCL generic changes and code clean-up
	- ABI clean-up. Stage 1: Separate kernel arguments and OCL objects. OCL objects will be passed in the new arrays of mem objects, samplers and device queue objects. The kernel arguments will contain GPU virtual addresses.

	http://ocltc.amd.com/reviews/r/14881/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#48 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#302 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#129 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#323 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#417 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#97 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#20 edit


[ROCm/clr commit: affe06135d]
2018-05-23 17:24:32 -04:00
foreman affe06135d P4 to Git Change 1558704 by gandryey@gera-w8 on 2018/05/23 17:20:01
SWDEV-79445 - OCL generic changes and code clean-up
	- ABI clean-up. Stage 1: Separate kernel arguments and OCL objects. OCL objects will be passed in the new arrays of mem objects, samplers and device queue objects. The kernel arguments will contain GPU virtual addresses.

	http://ocltc.amd.com/reviews/r/14881/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#48 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#302 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#129 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#323 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#417 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#97 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#20 edit
2018-05-23 17:24:32 -04:00
foreman abfbedddc3 P4 to Git Change 1558704 by gandryey@gera-w8 on 2018/05/23 17:20:01
SWDEV-79445 - OCL generic changes and code clean-up
	- ABI clean-up. Stage 1: Separate kernel arguments and OCL objects. OCL objects will be passed in the new arrays of mem objects, samplers and device queue objects. The kernel arguments will contain GPU virtual addresses.

	http://ocltc.amd.com/reviews/r/14881/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#48 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#302 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#129 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#323 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#417 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#97 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#20 edit


[ROCm/clr commit: 2176dc3b19]
2018-05-23 17:24:32 -04:00
foreman 2176dc3b19 P4 to Git Change 1558704 by gandryey@gera-w8 on 2018/05/23 17:20:01
SWDEV-79445 - OCL generic changes and code clean-up
	- ABI clean-up. Stage 1: Separate kernel arguments and OCL objects. OCL objects will be passed in the new arrays of mem objects, samplers and device queue objects. The kernel arguments will contain GPU virtual addresses.

	http://ocltc.amd.com/reviews/r/14881/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#48 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#302 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#129 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#323 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#417 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#97 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.hpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#20 edit
2018-05-23 17:24:32 -04:00
foreman 4d8bd812ec P4 to Git Change 1558617 by vsytchen@vsytchen-win10 on 2018/05/23 15:39:19
SWDEV-153682 - Report cl_amd_planar_yuv extension in OpenCL

	1. Enable cl_amd_planar_yuv extension for mainline.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14948/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#301 edit


[ROCm/clr commit: 05fc09fe2c]
2018-05-23 15:50:44 -04:00
foreman 05fc09fe2c P4 to Git Change 1558617 by vsytchen@vsytchen-win10 on 2018/05/23 15:39:19
SWDEV-153682 - Report cl_amd_planar_yuv extension in OpenCL

	1. Enable cl_amd_planar_yuv extension for mainline.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14948/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#301 edit
2018-05-23 15:50:44 -04:00
foreman f436a9791a P4 to Git Change 1558526 by skudchad@skudchad_test2_win_opencl on 2018/05/23 13:34:33
SWDEV-145570 - [HIP]  Implement hipPointerGetAttributes.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14938/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#28 edit


[ROCm/clr commit: 113c711b81]
2018-05-23 13:40:52 -04:00
foreman 113c711b81 P4 to Git Change 1558526 by skudchad@skudchad_test2_win_opencl on 2018/05/23 13:34:33
SWDEV-145570 - [HIP]  Implement hipPointerGetAttributes.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14938/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#28 edit
2018-05-23 13:40:52 -04:00
foreman 0bc42c767d P4 to Git Change 1558526 by skudchad@skudchad_test2_win_opencl on 2018/05/23 13:34:33
SWDEV-145570 - [HIP]  Implement hipPointerGetAttributes.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14938/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#28 edit


[ROCm/hip commit: 0fe5f87cba]
2018-05-23 13:40:52 -04:00
foreman 0fe5f87cba P4 to Git Change 1558526 by skudchad@skudchad_test2_win_opencl on 2018/05/23 13:34:33
SWDEV-145570 - [HIP]  Implement hipPointerGetAttributes.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14938/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#28 edit
2018-05-23 13:40:52 -04:00
Alex Voicu 1b44a52e63 Merge branch 'feature_use_Float16' of https://github.com/ROCm-Developer-Tools/HIP into feature_use_Float16
[ROCm/clr commit: a8a9f3bdc5]
2018-05-23 17:58:13 +01:00
Alex Voicu a8a9f3bdc5 Merge branch 'feature_use_Float16' of https://github.com/ROCm-Developer-Tools/HIP into feature_use_Float16 2018-05-23 17:58:13 +01:00
Alex Voicu 906ac8ec69 Merge branch 'feature_use_Float16' of https://github.com/ROCm-Developer-Tools/HIP into feature_use_Float16
[ROCm/hip commit: fe6ef584a7]
2018-05-23 17:58:13 +01:00
Alex Voicu fe6ef584a7 Merge branch 'feature_use_Float16' of https://github.com/ROCm-Developer-Tools/HIP into feature_use_Float16 2018-05-23 17:58:13 +01:00
Alex Voicu 2b16b4e31b Missing commit.
[ROCm/clr commit: ecefdd6541]
2018-05-23 17:57:47 +01:00
Alex Voicu ecefdd6541 Missing commit. 2018-05-23 17:57:47 +01:00
Alex Voicu 4ceb9cbc09 Missing commit.
[ROCm/hip commit: 6f819f226b]
2018-05-23 17:57:47 +01:00
Alex Voicu 6f819f226b Missing commit. 2018-05-23 17:57:47 +01:00
Alex Voicu c037f3b9b6 Re-factor half support to match CUDA whilst exploiting native support.
[ROCm/clr commit: 36e805cf76]
2018-05-23 17:57:09 +01:00
Alex Voicu 36e805cf76 Re-factor half support to match CUDA whilst exploiting native support. 2018-05-23 17:57:09 +01:00
Alex Voicu 8059debda1 Re-factor half support to match CUDA whilst exploiting native support.
[ROCm/hip commit: 1dba835e32]
2018-05-23 17:57:09 +01:00
Alex Voicu 1dba835e32 Re-factor half support to match CUDA whilst exploiting native support. 2018-05-23 17:57:09 +01:00
foreman e823f4f3a9 P4 to Git Change 1558428 by vsytchen@vsytchen-win10 on 2018/05/23 10:55:37
SWDEV-153051 - Maya 2018 unable to load OpenCL device on Vega 10 Lnx-Pro

	1. Enable SVM on Lnx-Pro

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#89 edit


[ROCm/clr commit: 4bff7e6b91]
2018-05-23 12:19:25 -04:00
foreman 4bff7e6b91 P4 to Git Change 1558428 by vsytchen@vsytchen-win10 on 2018/05/23 10:55:37
SWDEV-153051 - Maya 2018 unable to load OpenCL device on Vega 10 Lnx-Pro

	1. Enable SVM on Lnx-Pro

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#89 edit
2018-05-23 12:19:25 -04:00
Rahul Garg 432467d88b Optimize memcpy2D kernel use
[ROCm/clr commit: 2c3d1498d4]
2018-05-23 14:43:47 +05:30
Rahul Garg 2c3d1498d4 Optimize memcpy2D kernel use 2018-05-23 14:43:47 +05:30
Rahul Garg 08f750571d Optimize memcpy2D kernel use
[ROCm/hip commit: 9a76d5b94c]
2018-05-23 14:43:47 +05:30
Rahul Garg 9a76d5b94c Optimize memcpy2D kernel use 2018-05-23 14:43:47 +05:30
foreman b3272f473a P4 to Git Change 1558153 by johtaylo@johtaylo-jtincrementor2-increment on 2018/05/23 03:00:05
SWDEV-2 - Change OpenCL version number from 2659 to 2660.

Affected files ...

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


[ROCm/clr commit: 99d43874e6]
2018-05-23 03:10:21 -04:00
foreman 99d43874e6 P4 to Git Change 1558153 by johtaylo@johtaylo-jtincrementor2-increment on 2018/05/23 03:00:05
SWDEV-2 - Change OpenCL version number from 2659 to 2660.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/versions.hpp#2407 edit
2018-05-23 03:10:21 -04:00
foreman 755aadcf1e P4 to Git Change 1557880 by vsytchen@vsytchen-win10 on 2018/05/22 14:37:35
SWDEV-153682 - Report cl_amd_planar_yuv extension in OpenCL

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14917/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#300 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#360 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11Common.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11Common.h#2 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11NV12.cpp#4 delete
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11NV12.h#2 delete
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11YUY2.cpp#1 add
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11YUY2.h#1 add
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/TestList.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/build/Makefile.dx#2 edit


[ROCm/clr commit: f17ee3da60]
2018-05-22 14:44:23 -04:00
foreman f17ee3da60 P4 to Git Change 1557880 by vsytchen@vsytchen-win10 on 2018/05/22 14:37:35
SWDEV-153682 - Report cl_amd_planar_yuv extension in OpenCL

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/14917/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#300 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#360 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11Common.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11Common.h#2 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11NV12.cpp#4 delete
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11NV12.h#2 delete
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11YUY2.cpp#1 add
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/OCLDX11YUY2.h#1 add
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/TestList.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/dx/build/Makefile.dx#2 edit
2018-05-22 14:44:23 -04:00
Evgeny b8fc3818de adding dispatch_packet field to rocprofiler_callback_data_t
Change-Id: I3cbe256130fa23dd24b094f27286d566ed339230
2018-05-22 13:17:03 -05:00
Evgeny ae9c4f2ea4 adding dispatch_packet field to rocprofiler_callback_data_t
Change-Id: I3cbe256130fa23dd24b094f27286d566ed339230


[ROCm/rocprofiler commit: b8fc3818de]
2018-05-22 13:17:03 -05:00
Qingchuan Shi 3a46556dcc Add debug trap rocrtst.
Change-Id: I73682d7a2ad51eed9988075e012478a1afc76c7c
2018-05-22 13:31:45 -04:00
Qingchuan Shi 91b3e8d552 Add debug trap rocrtst.
Change-Id: I73682d7a2ad51eed9988075e012478a1afc76c7c


[ROCm/ROCR-Runtime commit: 3a46556dcc]
2018-05-22 13:31:45 -04:00
Jenkins ba56bbd426 Merge 'master' into 'amd-master'
Change-Id: I40bfec7bdb863b483485ff5d7ccc6973d9b5f357


[ROCm/clr commit: ca06311090]
2018-05-22 04:09:35 -05:00