Enable static_host_libarary testing and remove --emit-static-lib for new llvm driver (#437)

* Enable static_host_library

Signed-off-by: zichguan-amd <zichuan.guan@amd.com>

* Remove --emit-static-lib for new llvm driver

Signed-off-by: zichguan-amd <zichuan.guan@amd.com>

* Fix static lib command

Signed-off-by: zichguan-amd <zichuan.guan@amd.com>

---------

Signed-off-by: zichguan-amd <zichuan.guan@amd.com>

Author: zichguan-amd

HIP-Basic/CMakeLists.txt

@@ -133,13 +133,7 @@ add_subdirectory(occupancy)
 add_subdirectory(runtime_compilation)
 add_subdirectory(saxpy)
 add_subdirectory(shared_memory)
-# We cannot build the static library on Windows as the HIP SDK does not include CMAKE_AR.
-if(
-    NOT CMAKE_SYSTEM_NAME MATCHES "Windows"
-    AND NOT "${ROCM_EXAMPLES_GPU_LANGUAGE}" STREQUAL "HIP"
-)
-    add_subdirectory(static_host_library)
-endif()
+add_subdirectory(static_host_library)
 add_subdirectory(streams)
 add_subdirectory(texture_management)
 add_subdirectory(warp_shuffle)

HIP-Basic/static_host_library/Makefile

@@ -29,8 +29,9 @@ ROCM_INSTALL_DIR ?= /opt/rocm
 CUDA_INSTALL_DIR ?= /usr/local/cuda
 HIP_INCLUDE_DIR  := $(ROCM_INSTALL_DIR)/include
 
-HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc
 CXX    ?= g++
+HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc
+AR     ?= ar
 
 # Common variables and flags
 CXX_STD   := c++17
@@ -49,7 +50,7 @@ ifeq ($(GPU_RUNTIME), CUDA)
   HIPLIBS   += -L$(CUDA_INSTALL_DIR)/lib64 -lcudart
 else ifeq ($(GPU_RUNTIME), HIP)
   CXXFLAGS  ?= -Wall -Wextra
-  LIBFLAGS  += --emit-static-lib -fPIC
+  LIBFLAGS  += -c -fPIC
   HIPLIBS   += -L$(ROCM_INSTALL_DIR)/lib -lamdhip64
   HOSTFLAGS += $(CXXFLAGS)
 else
@@ -63,6 +64,7 @@ ILDLIBS    += $(LDLIBS)
 
 EXAMPLE_CXX := $(EXAMPLE)_cxx
 EXAMPLE_LIB := hip_static_host
+LIBOBJ      := lib$(EXAMPLE_LIB).o
 LIBEXAMPLE  := lib$(EXAMPLE_LIB).a
 
 all: $(EXAMPLE) $(EXAMPLE_CXX)
@@ -73,10 +75,13 @@ $(EXAMPLE): main.cpp $(LIBEXAMPLE)
 $(EXAMPLE_CXX): main.cpp $(LIBEXAMPLE)
 	$(CXX) $(HOSTFLAGS) $(ICPPFLAGS) -L. $(ILDFLAGS) -o $@ $< -l$(EXAMPLE_LIB) $(HIPLIBS) $(ILDLIBS)
 
-$(LIBEXAMPLE): library/library.hip $(COMMON_INCLUDE_DIR)/example_utils.hpp
+$(LIBOBJ): library/library.hip $(COMMON_INCLUDE_DIR)/example_utils.hpp
 	$(HIPCXX) $(ICXXFLAGS) $(ICPPFLAGS) $(ILDFLAGS) $(LIBFLAGS) -o $@ $< $(ILDLIBS)
 
+$(LIBEXAMPLE): $(LIBOBJ)
+	$(AR) rcs $@ $(LIBOBJ)
+
 clean:
-	$(RM) $(EXAMPLE_CXX) $(EXAMPLE) $(LIBEXAMPLE)
+	$(RM) $(EXAMPLE_CXX) $(EXAMPLE) $(LIBEXAMPLE) $(LIBOBJ)
 
 .PHONY: all clean

HIP-Basic/static_host_library/README.md

@@ -18,10 +18,11 @@ This example shows how to create a static library that exports hosts functions.
 
 ## Build Process
 
-A HIP static host library is built the same as a regular application, except that the additional flag `--emit-static-lib` must be passed to `hipcc`. Additionally, the library should be compiled with position independent code enabled:
+A HIP static host library is built the same as a regular application. Additionally, the library should be compiled with position independent code enabled:
 
 ```shell
-hipcc library/library.hip -o liblibrary.a --emit-static-lib -fPIC
+hipcc library/library.hip -o liblibrary.o -c -fPIC
+ar rcs liblibrary.a liblibrary.o
 ```
 
 Linking the static library with another library or object is done in the same way as a regular library: