diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71077d22ef..bdbb0470d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,9 +160,14 @@ set_property(CACHE FF_GPU_BACKEND PROPERTY STRINGS ${FF_GPU_BACKENDS})
 
 # option for cuda arch
 set(FF_CUDA_ARCH "autodetect" CACHE STRING "Target CUDA Arch")
-if (FF_CUDA_ARCH STREQUAL "")
+if ((FF_GPU_BACKEND STREQUAL "cuda" OR FF_GPU_BACKEND STREQUAL "hip_cuda") AND FF_CUDA_ARCH STREQUAL "")
   message(FATAL_ERROR "FF_CUDA_ARCH cannot be an empty string. Set it to `autodetect`, `all`, or pass one or multiple valid CUDA archs.")
 endif()
+# option for hip arch
+set(FF_HIP_ARCH "all" CACHE STRING "Target HIP Arch")
+if (FF_GPU_BACKEND STREQUAL "hip_rocm" AND FF_CUDA_ARCH STREQUAL "")
+  message(FATAL_ERROR "FF_HIP_ARCH cannot be an empty string. Set it to `all`, or pass one or multiple valid HIP archs.")
+endif()
 
 # option for nccl
 option(FF_USE_NCCL "Run FlexFlow with NCCL" OFF)
@@ -397,6 +402,20 @@ elseif(FF_GPU_BACKEND STREQUAL "hip_cuda" OR FF_GPU_BACKEND STREQUAL "hip_rocm")
 
     add_compile_definitions(FF_USE_HIP_ROCM)
 
+    if (NOT FF_HIP_ARCH STREQUAL "")
+      if (FF_HIP_ARCH STREQUAL "all")
+        set(FF_HIP_ARCH "gfx700,gfx701,gfx702,gfx703,gfx704,gfx705,gfx801,gfx802,gfx803,gfx805,gfx8010,gfx900,gfx902,gfx904,gfx906,gfx908,gfx909,gfx90a,gfx90c,gfx940,gfx941,gfx942,gfx1010,gfx1011,gfx1012,gfx1013,gfx1030,gfx1031,gfx1032,gfx1033,gfx1034,gfx1035,gfx1036,gfx1100,gfx1101,gfx1102,gfx1103,gfx1150,gfx1151")
+      endif()
+      string(REPLACE "," " " HIP_ARCH_LIST "${FF_HIP_ARCH}")
+      set_property(TARGET flexflow PROPERTY HIP_ARCHITECTURES "${HIP_ARCH_LIST}")
+    endif()
+
+    message(STATUS "FF_GPU_BACKEND: ${FF_GPU_BACKEND}")
+    message(STATUS "FF_HIP_ARCH: ${FF_HIP_ARCH}")
+    message(STATUS "HIP_ARCH_LIST: ${HIP_ARCH_LIST}")
+    get_property(CHECK_HIP_ARCHS TARGET flexflow PROPERTY HIP_ARCHITECTURES)
+    message(STATUS "CHECK_HIP_ARCHS: ${CHECK_HIP_ARCHS}")
+
     # The hip cmake config module defines three targets, 
     # hip::amdhip64, hip::host, and hip::device.
     #
diff --git a/cmake/legion.cmake b/cmake/legion.cmake
index b4cfad20e2..842d22bb1a 100644
--- a/cmake/legion.cmake
+++ b/cmake/legion.cmake
@@ -142,8 +142,10 @@ else()
 			set(Legion_USE_HIP ON CACHE BOOL "enable Legion_USE_HIP" FORCE)
 			if (FF_GPU_BACKEND STREQUAL "hip_cuda")
 				set(Legion_HIP_TARGET "CUDA" CACHE STRING "Legion_HIP_TARGET CUDA" FORCE)
+				set(Legion_CUDA_ARCH ${FF_CUDA_ARCH} CACHE STRING "Legion CUDA ARCH" FORCE)
 			elseif(FF_GPU_BACKEND STREQUAL "hip_rocm")
 				set(Legion_HIP_TARGET "ROCM" CACHE STRING "Legion HIP_TARGET ROCM" FORCE)
+				set(Legion_HIP_ARCH ${FF_HIP_ARCH} CACHE STRING "Legion HIP ARCH" FORCE)
 			endif()
 		endif()
 		set(Legion_REDOP_COMPLEX OFF CACHE BOOL "disable complex")
diff --git a/inference/incr_decoding/CMakeLists.txt b/inference/incr_decoding/CMakeLists.txt
index fee6e0ca83..8d9500ae3e 100644
--- a/inference/incr_decoding/CMakeLists.txt
+++ b/inference/incr_decoding/CMakeLists.txt
@@ -18,6 +18,10 @@ if (FF_GPU_BACKEND STREQUAL "cuda" OR FF_GPU_BACKEND STREQUAL "hip_cuda")
   target_compile_definitions(${project_target} PRIVATE __HIP_PLATFORM_NVIDIA__)
 elseif(FF_GPU_BACKEND STREQUAL "hip_rocm")
   hip_add_executable(${project_target} ${CPU_SRC})
+  if (HIP_ARCH_LIST STREQUAL "")
+    message(FATAL_ERROR "HIP_ARCH_LIST is empty!")
+  endif()
+  set_property(TARGET ${project_target} PROPERTY HIP_ARCHITECTURES "${HIP_ARCH_LIST}")
   target_compile_definitions(${project_target} PRIVATE __HIP_PLATFORM_AMD__)
 else()
   message(FATAL_ERROR "Compilation of ${project_target} for ${FF_GPU_BACKEND} backend not yet supported")
diff --git a/inference/spec_infer/CMakeLists.txt b/inference/spec_infer/CMakeLists.txt
index 3ab5b87d91..b1586de324 100644
--- a/inference/spec_infer/CMakeLists.txt
+++ b/inference/spec_infer/CMakeLists.txt
@@ -17,6 +17,10 @@ if (FF_GPU_BACKEND STREQUAL "cuda" OR FF_GPU_BACKEND STREQUAL "hip_cuda")
   target_compile_definitions(${project_target} PRIVATE __HIP_PLATFORM_NVIDIA__)
 elseif(FF_GPU_BACKEND STREQUAL "hip_rocm")
   hip_add_executable(${project_target} ${CPU_SRC})
+  if (HIP_ARCH_LIST STREQUAL "")
+    message(FATAL_ERROR "HIP_ARCH_LIST is empty!")
+  endif()
+  set_property(TARGET ${project_target} PROPERTY HIP_ARCHITECTURES "${HIP_ARCH_LIST}")
   target_compile_definitions(${project_target} PRIVATE __HIP_PLATFORM_AMD__)
 else()
   message(FATAL_ERROR "Compilation of ${project_target} for ${FF_GPU_BACKEND} backend not yet supported")