diff --git a/projects/hip/bin/hipgenisa.sh b/projects/hip/bin/hipgenisa.sh
index 4833750e53..ffad52393c 100755
--- a/projects/hip/bin/hipgenisa.sh
+++ b/projects/hip/bin/hipgenisa.sh
@@ -5,15 +5,12 @@ if [ $# = 0 ]; then
 fi
 
 : ${ROCM_PATH:=/opt/rocm}
+: ${ROCM_TARGET:=fiji}
+
 GEN_ISA=$1
 FILE_NAMES=$2
 OUT=$3
 OUTPUT_FILE=$4
-TARGET=""
-if [ ${GEN_ISA:0:12} = "--target-isa" ]
-then
-  TARGET=${GEN_ISA:13:12}
-fi
 
 SOURCE="${BASH_SOURCE[0]}"
 HIP_PATH="$( command cd -P "$( dirname "$SOURCE" )/.." && pwd )"
@@ -27,7 +24,7 @@ int main(){}
 " >> $FILE_NAMES.kernel.tmp.cpp
 $HIP_PATH/bin/hipcc $FILE_NAMES.kernel.tmp.cpp -o $hipgenisa_dir/a.out
 mv dump.* $hipgenisa_dir
-$ROCM_PATH/hcc-lc/bin/llvm-mc -arch=amdgcn -mcpu=$TARGET -filetype=obj $hipgenisa_dir/dump.isa -o $hipgenisa_dir/dump.o
+$ROCM_PATH/hcc-lc/bin/llvm-mc -arch=amdgcn -mcpu=$ROCM_TARGET -filetype=obj $hipgenisa_dir/dump.isa -o $hipgenisa_dir/dump.o
 $ROCM_PATH/llvm/bin/clang -target amdgcn--amdhsa $hipgenisa_dir/dump.o -o $hipgenisa_dir/dump.co
 map_sym=""
 kernels=$(objdump -t $hipgenisa_dir/dump.co | grep grid_launch_parm | sed 's/ \+/ /g; s/\t/ /g' | cut -d" " -f6)