[SYCL][HIP] Fix HIP headers warning (#9550)

Using the headers in `hip/include/hip` is deprecated since ROCm 5.2,
older versions of HIP also have this directory symlinked in `include` so
we can just update to the new path.

Fixes #9457

And reverts #9458

Author: npmiller

sycl/plugins/hip/CMakeLists.txt

@@ -12,7 +12,7 @@ set(SYCL_BUILD_PI_HIP_INCLUDE_DIR "" CACHE STRING "Override HIP include dir path
 set(SYCL_BUILD_PI_HIP_HSA_INCLUDE_DIR "" CACHE STRING "Override HSA include dir path (set to \"\" for default behavior)")
 
 if("${SYCL_BUILD_PI_HIP_INCLUDE_DIR}" STREQUAL "")
-  set(PI_HIP_INCLUDE_DIR "${SYCL_BUILD_PI_HIP_ROCM_DIR}/hip/include")
+  set(PI_HIP_INCLUDE_DIR "${SYCL_BUILD_PI_HIP_ROCM_DIR}/include")
 else()
   set(PI_HIP_INCLUDE_DIR "${SYCL_BUILD_PI_HIP_INCLUDE_DIR}")
 endif()
@@ -98,12 +98,6 @@ add_sycl_plugin(hip
 )
 set_target_properties(pi_hip PROPERTIES LINKER_LANGUAGE CXX)
 
-if (NOT WIN32)
-  # TODO: Temporarily disable deprecation warnings from the HIP headers. Remove
-  # this when https://github.com/intel/llvm/issues/9457 is addressed.
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-cpp")
-endif()
-
 if("${SYCL_BUILD_PI_HIP_PLATFORM}" STREQUAL "AMD")
   # Import HIP runtime library
   add_library(rocmdrv SHARED IMPORTED GLOBAL)