Merge commit '43aec5ad^' into merge-2.4

Conflicts:
	modules/contrib/src/inputoutput.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpuarithm/perf/perf_element_operations.cpp
	modules/gpuarithm/src/element_operations.cpp
	modules/ts/src/precomp.hpp

modules/ts/src/precomp.hpp

@@ -1,6 +1,7 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
 #include "opencv2/ts.hpp"
+#include "cvconfig.h"
 
 #ifdef GTEST_LINKED_AS_SHARED_LIBRARY
 #error ts module should not have GTEST_LINKED_AS_SHARED_LIBRARY defined

modules/ts/src/ts_perf.cpp

@@ -740,6 +740,14 @@ void TestBase::RecordRunParameters()
 {
     ::testing::Test::RecordProperty("cv_implementation", param_impl);
     ::testing::Test::RecordProperty("cv_num_threads", param_threads);
+
+#ifdef HAVE_CUDA
+    if (param_impl == "cuda")
+    {
+        cv::gpu::DeviceInfo info(param_cuda_device);
+        ::testing::Test::RecordProperty("cv_cuda_gpu", info.name());
+    }
+#endif
 }
 
 std::string TestBase::getSelectedImpl()