Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions Test/astc_test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ def parse_command_line():

# All reference encoders
reference_encoders = [
'rebuild',

'ref-5.0-neon',
'ref-5.0-sse2', 'ref-5.0-sse4.1', 'ref-5.0-avx2',

Expand Down Expand Up @@ -403,7 +405,7 @@ def parse_command_line():
quality_choices = list(TEST_QUALITIES)
quality_choices.append('all')
quality_choices.append('all+')
parser.add_argument('--test-quality', dest='test_qual', default='thorough',
parser.add_argument('--test-quality', dest='test_qual', action='append',
choices=quality_choices, help='test quality')

parser.add_argument('--repeats', dest='repeats', default=1,
Expand All @@ -425,14 +427,13 @@ def parse_command_line():
else:
args.encoders = [args.encoders]

if args.test_qual == 'all+':
if (args.test_qual is not None) and ('all+' in args.test_qual):
args.test_qual = TEST_QUALITIES
elif args.test_qual == 'all':

elif (args.test_qual is None) or ('all' in args.test_qual):
args.test_qual = TEST_QUALITIES
args.test_qual.remove('verythorough')
args.test_qual.remove('exhaustive')
else:
args.test_qual = [args.test_qual]

if not args.block_sizes or ('all' in args.block_sizes):
args.block_sizes = TEST_BLOCK_SIZES
Expand All @@ -452,6 +453,9 @@ def parse_command_line():
else:
args.formats = [args.formats]

if args.reference == 'rebuild':
args.reference = None

return args


Expand Down
10 changes: 5 additions & 5 deletions Test/astc_update_ref.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi
echo "Generating new ref-$1 results"

if [ "$1" = "main" ]; then
echo "Using binary from ./bin/${1}/"
echo "Using binary from ./bin/"
else
echo "Using binary from ./Binaries/${1}/"
fi
Expand All @@ -17,7 +17,7 @@ echo ""

TARGET_ROOT=${1}

python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-avx2
#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-sse4.1
#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-sse2
#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --encoder ref-$1-neon -j3
python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --reference rebuild --encoder ref-$1-avx2
#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --reference rebuild --encoder ref-$1-sse4.1
#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --reference rebuild --encoder ref-$1-sse2
#python3 ./Test/astc_test_image.py --test-set all --block-size all --test-quality all --repeats 6 --reference rebuild --encoder ref-$1-neon -j3
Loading