Skip to content

[HIP] fix test_blender.sh.in #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2024
Merged

[HIP] fix test_blender.sh.in #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions External/HIP/workload/blender/test_blender.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export CCC_OVERRIDE_OPTIONS=${HIP_BLENDER_TEST_CCC_OVERRIDE_OPTIONS:-"+-v"}
export HIP_CLANG_PATH=${HIP_CLANG_PATH:-"@HIP_CLANG_PATH@"}
export HIPCC_VERBOSE=${HIPCC_VERBOSE:-7}

blender_options=${HIP_BLENDER_TEST_OPTIONS:-"-F PNG --debug-cycles -- --cycles-device HIP"}
blender_options=${HIP_BLENDER_TEST_OPTIONS:-"--debug-cycles -- --cycles-device HIP"}
blender_dir=${HIP_BLENDER_TEST_BIN_DIR:-"$TEST_SUITE_HIP_ROOT/blender"}
scene_dir=${HIP_BLENDER_TEST_SCENES_DIR:-"$TEST_SUITE_HIP_ROOT/Blender_Scenes"}
log_dir=${HIP_BLENDER_TEST_LOG_DIR:-"$scene_dir/logs"}
Expand All @@ -20,7 +20,7 @@ clang_hash=""

get_clang_hash() {
clang_version_output=$($HIP_CLANG_PATH/clang -v 2>&1)
clang_hash=$(echo "$clang_version_output" | grep -oP '(?<=llvm-project )\w{8}')
clang_hash=$(echo "$clang_version_output" | sed -n 's/^clang version.*(.* \([0-9a-f]\+\)).*/\1/p' | cut -c1-8)
echo "$clang_hash"
}

Expand Down Expand Up @@ -63,7 +63,7 @@ render() {
echo "Render $input"

blender_output=$(mktemp)
timeout 300 $blender_dir/blender -b $input -o ${output}### -f $frame $blender_options 2>&1 | tee $blender_output
timeout 300 $blender_dir/blender -b $input -F PNG -o ${output}### -f $frame $blender_options 2>&1 | tee $blender_output
blender_return_code=${PIPESTATUS[0]}

average_time=$(grep -P "^\s*Path Tracing\s+\d+\.\d+\s+\d+\.\d+" $blender_output | awk '{print $4}')
Expand Down