SWDEV-334508 - Testing & fix for HIP samples on Linux and Windows. (#2711)

Change-Id: I6edc0d6dc7ce8f2223381baddacbc5063b6d4983

samples/0_Intro/bit_extract/CMakeLists.txt

@@ -22,7 +22,7 @@ project(bit_extract)
 
 cmake_minimum_required(VERSION 3.10)
 
-if(NOT DEFINED __HIP_ENABLE_PCH)
+if(NOT WIN32 AND NOT DEFINED __HIP_ENABLE_PCH)
   set(__HIP_ENABLE_PCH ON CACHE BOOL "enable/disable pre-compiled hip headers")
 endif()
 
@@ -49,4 +49,4 @@ set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
 add_executable(bit_extract bit_extract.cpp)
 
 # Link with HIP
-target_link_libraries(bit_extract hip::host)
+target_link_libraries(bit_extract hip::host)

samples/0_Intro/bit_extract/Makefile

@@ -19,7 +19,9 @@
 # THE SOFTWARE.
 
 #Dependencies : [MYHIP]/bin must be in user's path.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/0_Intro/module_api/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/0_Intro/module_api_global/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/0_Intro/square/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/1_Utils/hipBusBandwidth/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/1_Utils/hipBusBandwidth/hipBusBandwidth.cpp

@@ -137,7 +137,11 @@ void RunBenchmark_H2D(ResultDatabase& resultDB) {
         }
     } else if (p_malloc_mode == MallocUnpinned) {
         if (p_alignedhost) {
-            hostMem = (float*)aligned_alloc(p_alignedhost, numMaxFloats * sizeof(float));
+	#ifdef _WIN32
+	 hostMem = (float*)_aligned_malloc(numMaxFloats * sizeof(float),p_alignedhost);
+	#else
+         hostMem = (float*)aligned_alloc(p_alignedhost, numMaxFloats * sizeof(float));
+	#endif
         } else {
             hostMem = new float[numMaxFloats];
         }

samples/1_Utils/hipCommander/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/1_Utils/hipCommander/hipCommander.cpp

@@ -7,8 +7,9 @@
 #include <typeinfo>
 
 #include <hip/hip_runtime.h>
-
-#include <sys/time.h>
+#ifndef _WIN32
+ #include <sys/time.h>
+#endif
 
 #include "ResultDatabase.h"
 #include "nullkernel.hip.cpp"
@@ -134,9 +135,15 @@ int parseStandardArguments(int argc, char* argv[]) {
 
 // Returns the current system time in microseconds
 inline long long get_time() {
+#ifdef _WIN32
+    struct timespec ts;
+    timespec_get(&ts, TIME_UTC);
+    return (ts.tv_sec * 1000000) + (ts.tv_nsec/1000);
+#else
     struct timeval tv;
     gettimeofday(&tv, 0);
     return (tv.tv_sec * 1000000) + tv.tv_usec;
+#endif
 }
 
 
@@ -815,8 +822,11 @@ int main(int argc, char* argv[]) {
     if (p_blockingSync) {
 #ifdef __HIP_PLATFORM_AMD__
         printf("setting BlockingSync for AMD\n");
-        setenv("HIP_BLOCKING_SYNC", "1", 1);
-
+        #ifdef _WIN32
+	 _putenv_s("HIP_BLOCKING_SYNC", "1");
+	#else
+	 setenv("HIP_BLOCKING_SYNC", "1", 1);
+	#endif
 #endif
 #ifdef __HIP_PLATFORM_NVIDIA__
         printf("setting cudaDeviceBlockingSync\n");

samples/1_Utils/hipDispatchLatency/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/1_Utils/hipInfo/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/0_MatrixTranspose/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/10_inline_asm/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/11_texture_driver/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/12_cmake_hip_add_executable/CMakeLists.txt

@@ -31,7 +31,7 @@ if(NOT DEFINED HIP_PATH)
     endif()
 endif()
 set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
-
+set(CMAKE_HIP_ARCHITECTURES OFF)
 project(12_cmake)
 
 set(HIP_CLANG_NUM_PARALLEL_JOBS 2)
@@ -58,4 +58,4 @@ find_package(hip QUIET)
 if(TARGET hip::host)
     message(STATUS "Found hip::host at ${hip_DIR}")
     target_link_libraries(${MY_TARGET_NAME} hip::host)
-endif()
+endif()

samples/2_Cookbook/13_occupancy/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/14_gpu_arch/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/15_static_library/device_functions/Makefile

@@ -1,3 +1,6 @@
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/15_static_library/host_functions/Makefile

@@ -1,3 +1,6 @@
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/16_assembly_to_executable/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/17_llvm_ir_to_executable/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/3_shared_memory/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/4_shfl/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/5_2dshfl/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/6_dynamic_shared/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/7_streams/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/8_peer2peer/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))

samples/2_Cookbook/9_unroll/Makefile

@@ -17,7 +17,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-
+ifeq ($(OS),Windows_NT)
+ $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
+endif
 ROCM_PATH?= $(wildcard /opt/rocm/)
 HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
 ifeq (,$(HIP_PATH))