Replace ASM_REGISTER_STATE_CHECK with API_REGISTER_STATE_CHECK
This is done because aom_clear_system_state has been removed
from the codebase. Using API_REGISTER_STATE_CHECK helps
catching potential issues when future assembly are added.
BUG=aomedia:2968
Change-Id: I58dd79743c36fea635fa8506f127e0ac49bba5c9
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 40cc663..29d7f89 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -144,7 +144,7 @@
txfm_ref_(input_, coeffs_, stride, tx_type_, bit_depth_);
inv_txfm_ref_(coeffs_, output_ref_, stride, tx_type_, bit_depth_);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
inv_txfm_(coeffs_, output_, stride, tx_type_, bit_depth_));
for (int j = 0; j < num_coeffs_; ++j) {
diff --git a/test/av1_quantize_test.cc b/test/av1_quantize_test.cc
index 870d153..ce1311d 100644
--- a/test/av1_quantize_test.cc
+++ b/test/av1_quantize_test.cc
@@ -97,7 +97,7 @@
quant_shift_ptr, ref_qcoeff_ptr, ref_dqcoeff_ptr, dequant_ptr,
&ref_eob, scanOrder.scan, scanOrder.iscan, log_scale);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
quanFunc(coeff_ptr, count, zbin_ptr, round_ptr, quant_ptr,
quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, dequant_ptr, &eob,
scanOrder.scan, scanOrder.iscan, log_scale));
@@ -174,7 +174,7 @@
quant_shift_ptr, ref_qcoeff_ptr, ref_dqcoeff_ptr, dequant_ptr,
&ref_eob, scanOrder.scan, scanOrder.iscan, log_scale);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
quanFunc(coeff_ptr, count, zbin_ptr, round_ptr, quant_ptr,
quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, dequant_ptr, &eob,
scanOrder.scan, scanOrder.iscan, log_scale));
diff --git a/test/av1_temporal_denoiser_test.cc b/test/av1_temporal_denoiser_test.cc
index bf27571..571fd92 100644
--- a/test/av1_temporal_denoiser_test.cc
+++ b/test/av1_temporal_denoiser_test.cc
@@ -84,11 +84,11 @@
mc_avg_block[j] = (temp < 0) ? 0 : ((temp > 255) ? 255 : temp);
}
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
av1_denoiser_filter_c(sig_block, 128, mc_avg_block, 128, avg_block_c,
128, 0, bs_, motion_magnitude_random));
- ASM_REGISTER_STATE_CHECK(GET_PARAM(0)(sig_block, 128, mc_avg_block, 128,
+ API_REGISTER_STATE_CHECK(GET_PARAM(0)(sig_block, 128, mc_avg_block, 128,
avg_block_sse2, 128, 0, bs_,
motion_magnitude_random));
diff --git a/test/av1_wedge_utils_test.cc b/test/av1_wedge_utils_test.cc
index 69280b4..a51ce12 100644
--- a/test/av1_wedge_utils_test.cc
+++ b/test/av1_wedge_utils_test.cc
@@ -182,7 +182,7 @@
const uint64_t ref_res = params_.ref_func(r1, d, m, N);
uint64_t tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(r1, d, m, N));
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(r1, d, m, N));
ASSERT_EQ(ref_res, tst_res);
}
@@ -212,7 +212,7 @@
const uint64_t ref_res = params_.ref_func(r1, d, m, N);
uint64_t tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(r1, d, m, N));
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(r1, d, m, N));
ASSERT_EQ(ref_res, tst_res);
}
@@ -259,7 +259,7 @@
const int ref_res = params_.ref_func(ds, m, N, limit);
int tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(ds, m, N, limit));
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(ds, m, N, limit));
ASSERT_EQ(ref_res, tst_res);
}
@@ -314,7 +314,7 @@
const int ref_res = params_.ref_func(ds, m, N, limit);
int tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(ds, m, N, limit));
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(ds, m, N, limit));
ASSERT_EQ(ref_res, tst_res);
}
@@ -351,7 +351,7 @@
memset(&d_tst, INT16_MAX, sizeof(d_tst));
params_.ref_func(d_ref, a, b, N);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(d_tst, a, b, N));
+ API_REGISTER_STATE_CHECK(params_.tst_func(d_tst, a, b, N));
for (int i = 0; i < MAX_SB_SQUARE; ++i) ASSERT_EQ(d_ref[i], d_tst[i]);
}
diff --git a/test/avg_test.cc b/test/avg_test.cc
index d9e42d4..4c6d9b5 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -108,7 +108,7 @@
}
unsigned int actual;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
actual = GET_PARAM(4)(source_data_ + GET_PARAM(2), source_stride_));
EXPECT_EQ(expected, actual);
@@ -171,8 +171,8 @@
}
void RunComparison() {
- ASM_REGISTER_STATE_CHECK(c_func_(hbuf_c_, source_data_, 0, height_));
- ASM_REGISTER_STATE_CHECK(asm_func_(hbuf_asm_, source_data_, 0, height_));
+ API_REGISTER_STATE_CHECK(c_func_(hbuf_c_, source_data_, 0, height_));
+ API_REGISTER_STATE_CHECK(asm_func_(hbuf_asm_, source_data_, 0, height_));
EXPECT_EQ(0, memcmp(hbuf_c_, hbuf_asm_, sizeof(*hbuf_c_) * 16))
<< "Output mismatch\n";
}
@@ -230,8 +230,8 @@
protected:
void RunComparison() {
- ASM_REGISTER_STATE_CHECK(sum_c_ = c_func_(source_data_, width_));
- ASM_REGISTER_STATE_CHECK(sum_asm_ = asm_func_(source_data_, width_));
+ API_REGISTER_STATE_CHECK(sum_c_ = c_func_(source_data_, width_));
+ API_REGISTER_STATE_CHECK(sum_asm_ = asm_func_(source_data_, width_));
EXPECT_EQ(sum_c_, sum_asm_) << "Output mismatch";
}
void RunSpeedTest() {
@@ -546,19 +546,19 @@
}
void Check(int expected) {
int total_ref;
- ASM_REGISTER_STATE_CHECK(total_ref = satd_func_ref_(src_, satd_size_));
+ API_REGISTER_STATE_CHECK(total_ref = satd_func_ref_(src_, satd_size_));
EXPECT_EQ(expected, total_ref);
int total_simd;
- ASM_REGISTER_STATE_CHECK(total_simd = satd_func_simd_(src_, satd_size_));
+ API_REGISTER_STATE_CHECK(total_simd = satd_func_simd_(src_, satd_size_));
EXPECT_EQ(expected, total_simd);
}
void RunComparison() {
int total_ref;
- ASM_REGISTER_STATE_CHECK(total_ref = satd_func_ref_(src_, satd_size_));
+ API_REGISTER_STATE_CHECK(total_ref = satd_func_ref_(src_, satd_size_));
int total_simd;
- ASM_REGISTER_STATE_CHECK(total_simd = satd_func_simd_(src_, satd_size_));
+ API_REGISTER_STATE_CHECK(total_simd = satd_func_simd_(src_, satd_size_));
EXPECT_EQ(total_ref, total_simd);
}
diff --git a/test/blend_a64_mask_1d_test.cc b/test/blend_a64_mask_1d_test.cc
index 1b6350c..9a95987 100644
--- a/test/blend_a64_mask_1d_test.cc
+++ b/test/blend_a64_mask_1d_test.cc
@@ -125,7 +125,7 @@
params_.ref_func(dst_ref_ + dst_offset_, dst_stride_, p_src0 + src0_offset_,
src0_stride_, p_src1 + src1_offset_, src1_stride_, mask_,
w_, h_);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(
+ API_REGISTER_STATE_CHECK(params_.tst_func(
dst_tst_ + dst_offset_, dst_stride_, p_src0 + src0_offset_,
src0_stride_, p_src1 + src1_offset_, src1_stride_, mask_, w_, h_));
}
@@ -232,7 +232,7 @@
CONVERT_TO_BYTEPTR(p_src0 + src0_offset_), src0_stride_,
CONVERT_TO_BYTEPTR(p_src1 + src1_offset_), src1_stride_,
mask_, w_, h_, bit_depth_);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(
+ API_REGISTER_STATE_CHECK(params_.tst_func(
CONVERT_TO_BYTEPTR(dst_tst_ + dst_offset_), dst_stride_,
CONVERT_TO_BYTEPTR(p_src0 + src0_offset_), src0_stride_,
CONVERT_TO_BYTEPTR(p_src1 + src1_offset_), src1_stride_, mask_, w_, h_,
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index da76a1d..a0e3bcb 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -122,7 +122,7 @@
// If cdef and ref_cdef are the same, we're just testing
// speed
if (cdef != ref_cdef)
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
cdef(depth == 8 ? (uint8_t *)d : 0, d, size,
s + CDEF_HBORDER + CDEF_VBORDER * CDEF_BSTRIDE,
pristrength, secstrength, dir, pridamping,
@@ -232,7 +232,7 @@
for (int c = 0; c < 1 + 9 * (finddir == ref_finddir); c++)
ref_res = ref_finddir(s, size, &ref_var, depth - 8);
if (finddir != ref_finddir)
- ASM_REGISTER_STATE_CHECK(res = finddir(s, size, &var, depth - 8));
+ API_REGISTER_STATE_CHECK(res = finddir(s, size, &var, depth - 8));
if (ref_finddir != finddir) {
if (res != ref_res || var != ref_var) error = 1;
errdepth = depth;
diff --git a/test/convolve_round_test.cc b/test/convolve_round_test.cc
index 9a05f1c..ec9fd6d 100644
--- a/test/convolve_round_test.cc
+++ b/test/convolve_round_test.cc
@@ -113,7 +113,7 @@
GenerateBufferWithRandom(src_, src_stride, bits, w, h);
func_ref_(src_, src_stride, dst_ref, dst_stride, w, h, bits);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
func_(src_, src_stride, dst, dst_stride, w, h, bits));
if (data_path_ == LOWBITDEPTH_TEST) {
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 2cfcab9..097a826 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -535,11 +535,11 @@
if (filter_x && filter_y)
continue;
else if (filter_y)
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
UUT_->v8_(in, kInputStride, out, kOutputStride, kInvalidFilter,
16, filters[filter_y], 16, Width(), Height()));
else if (filter_x)
- ASM_REGISTER_STATE_CHECK(UUT_->h8_(
+ API_REGISTER_STATE_CHECK(UUT_->h8_(
in, kInputStride, out, kOutputStride, filters[filter_x], 16,
kInvalidFilter, 16, Width(), Height()));
else
@@ -617,11 +617,11 @@
if (filter_x && filter_y)
continue;
else if (filter_y)
- ASM_REGISTER_STATE_CHECK(UUT_->v8_(
+ API_REGISTER_STATE_CHECK(UUT_->v8_(
in, kInputStride, out, kOutputStride, kInvalidFilter, 16,
filters[filter_y], 16, Width(), Height()));
else if (filter_x)
- ASM_REGISTER_STATE_CHECK(UUT_->h8_(
+ API_REGISTER_STATE_CHECK(UUT_->h8_(
in, kInputStride, out, kOutputStride, filters[filter_x], 16,
kInvalidFilter, 16, Width(), Height()));
else
@@ -687,11 +687,11 @@
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
if (filter_x && filter_y) continue;
if (filter_y)
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
UUT_->v8_(in, kInputStride, out, kOutputStride, kInvalidFilter,
16, filters[filter_y], 16, Width(), Height()));
else if (filter_x)
- ASM_REGISTER_STATE_CHECK(UUT_->h8_(
+ API_REGISTER_STATE_CHECK(UUT_->h8_(
in, kInputStride, out, kOutputStride, filters[filter_x], 16,
kInvalidFilter, 16, Width(), Height()));
}
diff --git a/test/dr_prediction_test.cc b/test/dr_prediction_test.cc
index 4ad0a7f..2294656 100644
--- a/test/dr_prediction_test.cc
+++ b/test/dr_prediction_test.cc
@@ -198,7 +198,7 @@
if (params_.tst_fn) {
aom_usec_timer_start(&timer);
for (int k = 0; k < kNumTests; ++k) {
- ASM_REGISTER_STATE_CHECK(params_.tst_fn(dst_tst_, dst_stride_, bw_, bh_,
+ API_REGISTER_STATE_CHECK(params_.tst_fn(dst_tst_, dst_stride_, bw_, bh_,
above_, left_, upsample_above_,
upsample_left_, dx_, dy_, bd_));
}
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 05966ee..3ca4340 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -98,7 +98,7 @@
}
ref_ret =
ref_error_block_op_(coeff, dqcoeff, block_size, &ref_ssz, bit_depth_);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
ret = error_block_op_(coeff, dqcoeff, block_size, &ssz, bit_depth_));
err_count += (ref_ret != ret) | (ref_ssz != ssz);
if (err_count && !err_count_total) {
@@ -156,7 +156,7 @@
}
ref_ret =
ref_error_block_op_(coeff, dqcoeff, block_size, &ref_ssz, bit_depth_);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
ret = error_block_op_(coeff, dqcoeff, block_size, &ssz, bit_depth_));
err_count += (ref_ret != ret) | (ref_ssz != ssz);
if (err_count && !err_count_total) {
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index 7418f67..795616a 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_test.cc
@@ -69,7 +69,7 @@
while (tstIndex < MaxTestNum) {
PrepareBuffer();
predFuncRef_(predRef_, stride, txSize_, &above[1], left, mode_);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
predFunc_(pred_, stride, txSize_, &above[1], left, mode_));
DiffPred(tstIndex);
tstIndex += 1;
diff --git a/test/fwht4x4_test.cc b/test/fwht4x4_test.cc
index ed6589b..2b470c1 100644
--- a/test/fwht4x4_test.cc
+++ b/test/fwht4x4_test.cc
@@ -117,7 +117,7 @@
aom_usec_timer c_timer_;
aom_usec_timer_start(&c_timer_);
for (int i = 0; i < numIter; i++) {
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
fwd_txfm_c_(input_block, output_ref_block, stride));
}
aom_usec_timer_mark(&c_timer_);
@@ -126,7 +126,7 @@
aom_usec_timer_start(&simd_timer_);
for (int i = 0; i < numIter; i++) {
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
fwd_txfm_(input_block, output_block, stride));
}
aom_usec_timer_mark(&simd_timer_);
diff --git a/test/hadamard_test.cc b/test/hadamard_test.cc
index 07776b2..0141125 100644
--- a/test/hadamard_test.cc
+++ b/test/hadamard_test.cc
@@ -163,7 +163,7 @@
for (int i = 0; i < block_size_; ++i) a[i] = Rand();
ReferenceHadamard(a, bwh_, b_ref, bwh_);
- ASM_REGISTER_STATE_CHECK(h_func_(a, bwh_, b));
+ API_REGISTER_STATE_CHECK(h_func_(a, bwh_, b));
// The order of the output is not important. Sort before checking.
std::sort(b, b + block_size_);
@@ -184,7 +184,7 @@
memset(b_ref, 0, sizeof(b_ref));
ReferenceHadamard(a, i, b_ref, bwh_);
- ASM_REGISTER_STATE_CHECK(h_func_(a, i, b));
+ API_REGISTER_STATE_CHECK(h_func_(a, i, b));
// The order of the output is not important. Sort before checking.
std::sort(b, b + block_size_);
diff --git a/test/intra_edge_test.cc b/test/intra_edge_test.cc
index f7702c9..84e712d 100644
--- a/test/intra_edge_test.cc
+++ b/test/intra_edge_test.cc
@@ -73,7 +73,7 @@
protected:
void Execute(uint8_t *edge_tst) {
params_.ref_func(edge_ref_, size_);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_));
}
};
@@ -117,7 +117,7 @@
protected:
void Execute(uint16_t *edge_tst) {
params_.ref_func(edge_ref_, size_, bit_depth_);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_, bit_depth_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_, bit_depth_));
}
int bit_depth_;
};
@@ -202,7 +202,7 @@
protected:
void Execute(uint8_t *edge_tst) {
params_.ref_func(edge_ref_, size_, strength_);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_, strength_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_, strength_));
}
};
@@ -240,7 +240,7 @@
protected:
void Execute(uint16_t *edge_tst) {
params_.ref_func(edge_ref_, size_, strength_);
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_, strength_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst, size_, strength_));
}
int bit_depth_;
};
@@ -284,7 +284,7 @@
}
edge_tst_ = &edge_tst_data_[kOffset];
for (int iter = 0; iter < test_count; ++iter) {
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_));
}
}
@@ -298,7 +298,7 @@
}
edge_tst_ = &edge_tst_data_[kOffset];
for (int iter = 0; iter < test_count; ++iter) {
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_, bit_depth_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_, bit_depth_));
}
}
@@ -311,7 +311,7 @@
}
edge_tst_ = &edge_tst_data_[kOffset];
for (int iter = 0; iter < test_count; ++iter) {
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_, strength_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_, strength_));
// iterate over filter strengths (1,2,3)
strength_ = (strength_ == 3) ? 1 : strength_ + 1;
}
@@ -328,7 +328,7 @@
}
edge_tst_ = &edge_tst_data_[kOffset];
for (int iter = 0; iter < test_count; ++iter) {
- ASM_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_, strength_));
+ API_REGISTER_STATE_CHECK(params_.tst_func(edge_tst_, size_, strength_));
// iterate over filter strengths (1,2,3)
strength_ = (strength_ == 3) ? 1 : strength_ + 1;
}
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index f6316f1..53f8c19 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -198,7 +198,7 @@
void Predict() {
const int bit_depth = params_.bit_depth;
params_.ref_fn(ref_dst_, stride_, above_row_, left_col_, bit_depth);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
params_.pred_fn(dst_, stride_, above_row_, left_col_, bit_depth));
}
void PredictRefSpeedTest(int num) {
@@ -222,7 +222,7 @@
protected:
void Predict() {
params_.ref_fn(ref_dst_, stride_, above_row_, left_col_);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
params_.pred_fn(dst_, stride_, above_row_, left_col_));
}
void PredictRefSpeedTest(int num) {
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index cf42967..3fc3822 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -199,7 +199,7 @@
InitInput<a, b>(s, ref_s, &rnd, *limit, mask_, p, i); \
call_filter(ref_s + 8 + p * 8, p, blimit, limit, thresh, bit_depth_, \
ref_loopfilter_op_); \
- ASM_REGISTER_STATE_CHECK(call_filter(s + 8 + p * 8, p, blimit, limit, \
+ API_REGISTER_STATE_CHECK(call_filter(s + 8 + p * 8, p, blimit, limit, \
thresh, bit_depth_, loopfilter_op_)); \
for (int j = 0; j < kNumCoeffs; ++j) { \
err_count += ref_s[j] != s[j]; \
@@ -247,7 +247,7 @@
} \
call_filter(ref_s + 8 + p * 8, p, blimit, limit, thresh, bit_depth_, \
ref_loopfilter_op_); \
- ASM_REGISTER_STATE_CHECK(call_filter(s + 8 + p * 8, p, blimit, limit, \
+ API_REGISTER_STATE_CHECK(call_filter(s + 8 + p * 8, p, blimit, limit, \
thresh, bit_depth_, loopfilter_op_)); \
for (int j = 0; j < kNumCoeffs; ++j) { \
err_count += ref_s[j] != s[j]; \
@@ -335,7 +335,7 @@
InitInput<a, b>(s, ref_s, &rnd, limit, mask_, p, i); \
call_dualfilter(ref_s + 8 + p * 8, p, blimit0, limit0, thresh0, blimit1, \
limit1, thresh1, bit_depth_, ref_loopfilter_op_); \
- ASM_REGISTER_STATE_CHECK( \
+ API_REGISTER_STATE_CHECK( \
call_dualfilter(s + 8 + p * 8, p, blimit0, limit0, thresh0, blimit1, \
limit1, thresh1, bit_depth_, loopfilter_op_)); \
for (int j = 0; j < kNumCoeffs; ++j) { \
@@ -396,7 +396,7 @@
} \
call_dualfilter(ref_s + 8 + p * 8, p, blimit0, limit0, thresh0, blimit1, \
limit1, thresh1, bit_depth_, ref_loopfilter_op_); \
- ASM_REGISTER_STATE_CHECK( \
+ API_REGISTER_STATE_CHECK( \
call_dualfilter(s + 8 + p * 8, p, blimit0, limit0, thresh0, blimit1, \
limit1, thresh1, bit_depth_, loopfilter_op_)); \
for (int j = 0; j < kNumCoeffs; ++j) { \
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index 3bc7c5c..91f7982 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -132,7 +132,7 @@
second_pred, msk, msk_stride, invert_mask);
} else {
for (int repeat = 0; repeat < times; ++repeat) {
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
sads[0] = maskedSAD_op_(src_ptr, src_stride, ref_ptr[0], ref_stride,
second_pred, msk, msk_stride, invert_mask));
}
@@ -156,7 +156,7 @@
int msk_stride, int invert_mask, unsigned sads[],
int times) {
if (times == 1) {
- ASM_REGISTER_STATE_CHECK(maskedSAD_op_(src_ptr, src_stride, ref_ptr,
+ API_REGISTER_STATE_CHECK(maskedSAD_op_(src_ptr, src_stride, ref_ptr,
ref_stride, second_pred, msk,
msk_stride, invert_mask, sads));
} else {
@@ -298,7 +298,7 @@
const double time1 = static_cast<double>(aom_usec_timer_elapsed(&timer));
aom_usec_timer_start(&timer);
if (run_times == 1) {
- ASM_REGISTER_STATE_CHECK(ret = maskedSAD_op_(src8_ptr, src_stride,
+ API_REGISTER_STATE_CHECK(ret = maskedSAD_op_(src8_ptr, src_stride,
ref8_ptr, ref_stride,
second_pred8_ptr, msk_ptr,
msk_stride, invert_mask));
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index aaf675a..4a4cb1a 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -93,7 +93,7 @@
ref_ret = ref_func_(src_ptr, src_stride, xoffset, yoffset, ref_ptr,
ref_stride, second_pred_ptr, msk_ptr, msk_stride,
invert_mask, &ref_sse);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
opt_ret = opt_func_(src_ptr, src_stride, xoffset, yoffset,
ref_ptr, ref_stride, second_pred_ptr, msk_ptr,
msk_stride, invert_mask, &opt_sse));
@@ -146,7 +146,7 @@
ref_ret = ref_func_(src_ptr, src_stride, xoffset, yoffset, ref_ptr,
ref_stride, second_pred_ptr, msk_ptr, msk_stride,
invert_mask, &ref_sse);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
opt_ret = opt_func_(src_ptr, src_stride, xoffset, yoffset,
ref_ptr, ref_stride, second_pred_ptr, msk_ptr,
msk_stride, invert_mask, &opt_sse));
@@ -229,7 +229,7 @@
ref_ret = ref_func_(src8_ptr, src_stride, xoffset, yoffset, ref8_ptr,
ref_stride, second_pred8_ptr, msk_ptr, msk_stride,
invert_mask, &ref_sse);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
opt_ret = opt_func_(src8_ptr, src_stride, xoffset, yoffset,
ref8_ptr, ref_stride, second_pred8_ptr,
msk_ptr, msk_stride, invert_mask, &opt_sse));
@@ -290,7 +290,7 @@
ref_ret = ref_func_(src8_ptr, src_stride, xoffset, yoffset, ref8_ptr,
ref_stride, second_pred8_ptr, msk_ptr, msk_stride,
invert_mask, &ref_sse);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
opt_ret = opt_func_(src8_ptr, src_stride, xoffset, yoffset,
ref8_ptr, ref_stride, second_pred8_ptr,
msk_ptr, msk_stride, invert_mask, &opt_sse));
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index a8290b2..9b70366 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -55,7 +55,7 @@
const unsigned int ref_res = params_.ref_func(pre, pre_stride, wsrc, mask);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res =
+ API_REGISTER_STATE_CHECK(tst_res =
params_.tst_func(pre, pre_stride, wsrc, mask));
ASSERT_EQ(ref_res, tst_res);
@@ -78,7 +78,7 @@
const unsigned int ref_res = params_.ref_func(pre, pre_stride, wsrc, mask);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res =
+ API_REGISTER_STATE_CHECK(tst_res =
params_.tst_func(pre, pre_stride, wsrc, mask));
ASSERT_EQ(ref_res, tst_res);
@@ -172,7 +172,7 @@
const unsigned int ref_res =
params_.ref_func(CONVERT_TO_BYTEPTR(pre), pre_stride, wsrc, mask);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
tst_res =
params_.tst_func(CONVERT_TO_BYTEPTR(pre), pre_stride, wsrc, mask));
@@ -197,7 +197,7 @@
const unsigned int ref_res =
params_.ref_func(CONVERT_TO_BYTEPTR(pre), pre_stride, wsrc, mask);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
tst_res =
params_.tst_func(CONVERT_TO_BYTEPTR(pre), pre_stride, wsrc, mask));
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index 58d2ad6..03b38f7 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -60,7 +60,7 @@
const unsigned int ref_res =
params_.ref_func(pre, pre_stride, wsrc, mask, &ref_sse);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
tst_res = params_.tst_func(pre, pre_stride, wsrc, mask, &tst_sse));
ASSERT_EQ(ref_res, tst_res);
@@ -86,7 +86,7 @@
const unsigned int ref_res =
params_.ref_func(pre, pre_stride, wsrc, mask, &ref_sse);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
tst_res = params_.tst_func(pre, pre_stride, wsrc, mask, &tst_sse));
ASSERT_EQ(ref_res, tst_res);
@@ -219,7 +219,7 @@
const unsigned int ref_res = params_.ref_func(
CONVERT_TO_BYTEPTR(pre), pre_stride, wsrc, mask, &ref_sse);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(CONVERT_TO_BYTEPTR(pre),
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(CONVERT_TO_BYTEPTR(pre),
pre_stride, wsrc, mask,
&tst_sse));
@@ -246,7 +246,7 @@
const unsigned int ref_res = params_.ref_func(
CONVERT_TO_BYTEPTR(pre), pre_stride, wsrc, mask, &ref_sse);
unsigned int tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(CONVERT_TO_BYTEPTR(pre),
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(CONVERT_TO_BYTEPTR(pre),
pre_stride, wsrc, mask,
&tst_sse));
diff --git a/test/quantize_func_test.cc b/test/quantize_func_test.cc
index 0d8dca3..f3f5c85 100644
--- a/test/quantize_func_test.cc
+++ b/test/quantize_func_test.cc
@@ -157,7 +157,7 @@
qcoeff_ref, dqcoeff_ref, dequant, &eob[0], sc->scan,
sc->iscan);
- ASM_REGISTER_STATE_CHECK(quant_(coeff_ptr, n_coeffs, zbin, round, quant,
+ API_REGISTER_STATE_CHECK(quant_(coeff_ptr, n_coeffs, zbin, round, quant,
quant_shift, qcoeff, dqcoeff, dequant,
&eob[1], sc->scan, sc->iscan));
@@ -268,7 +268,7 @@
quant_shift_ptr, qcoeff_ref_ptr, dqcoeff_ref_ptr, dequant_ptr,
eob_ref_ptr, scan, iscan);
- ASM_REGISTER_STATE_CHECK(quant_(
+ API_REGISTER_STATE_CHECK(quant_(
coeff_ptr, n_coeffs, zbin_ptr, round_ptr, quant_ptr, quant_shift_ptr,
qcoeff_ptr, dqcoeff_ptr, dequant_ptr, eob_ptr, scan, iscan));
}
diff --git a/test/register_state_check.h b/test/register_state_check.h
index d404621..4bf5120 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -18,18 +18,13 @@
#include "aom/aom_integer.h"
-// ASM_REGISTER_STATE_CHECK(asm_function)
-// Minimally validates the environment pre & post function execution. This
-// variant should be used with assembly functions which are not expected to
-// fully restore the system state. See platform implementations of
-// RegisterStateCheck for details.
-//
-// API_REGISTER_STATE_CHECK(api_function)
-// Performs all the checks done by ASM_REGISTER_STATE_CHECK() and any
-// additional checks to ensure the environment is in a consistent state pre &
-// post function execution. This variant should be used with API functions.
-// See platform implementations of RegisterStateCheckXXX for details.
-//
+// API_REGISTER_STATE_CHECK(function)
+// Validates the environment pre & post function execution to ensure the
+// environment is in a consistent state. This should be used with API
+// function sand assembly functions which are not expected to fully restore
+// the system state.
+// See platform implementations of RegisterStateCheck and
+// RegisterStateCheckMMX for details.
#if defined(_WIN64) && ARCH_X86_64
@@ -81,13 +76,6 @@
bool initialized_;
CONTEXT pre_context_;
};
-
-#define ASM_REGISTER_STATE_CHECK(statement) \
- do { \
- libaom_test::RegisterStateCheck reg_check; \
- statement; \
- } while (false)
-
} // namespace libaom_test
#else
@@ -95,15 +83,11 @@
namespace libaom_test {
class RegisterStateCheck {};
-#define ASM_REGISTER_STATE_CHECK(statement) statement
-
} // namespace libaom_test
#endif // _WIN64 && ARCH_X86_64
-#if ARCH_X86 || ARCH_X86_64
-#if defined(__GNUC__)
-
+#if (ARCH_X86 || ARCH_X86_64) && defined(__GNUC__)
namespace libaom_test {
// Checks the FPU tag word pre/post execution to ensure emms has been called.
@@ -129,20 +113,23 @@
uint16_t pre_fpu_env_[14];
};
-
-#define API_REGISTER_STATE_CHECK(statement) \
- do { \
- libaom_test::RegisterStateCheckMMX reg_check; \
- ASM_REGISTER_STATE_CHECK(statement); \
- } while (false)
-
} // namespace libaom_test
-#endif // __GNUC__
-#endif // ARCH_X86 || ARCH_X86_64
+#else
+namespace libaom_test {
-#ifndef API_REGISTER_STATE_CHECK
-#define API_REGISTER_STATE_CHECK ASM_REGISTER_STATE_CHECK
-#endif
+class RegisterStateCheckMMX {};
+} // namespace libaom_test
+
+#endif // (ARCH_X86 || ARCH_X86_64) && defined(__GNUC__)
+
+#define API_REGISTER_STATE_CHECK(statement) \
+ do { \
+ libaom_test::RegisterStateCheck reg_check; \
+ libaom_test::RegisterStateCheckMMX reg_check_mmx; \
+ statement; \
+ (void)reg_check_mmx; \
+ (void)reg_check; \
+ } while (false)
#endif // AOM_TEST_REGISTER_STATE_CHECK_H_
diff --git a/test/sad_test.cc b/test/sad_test.cc
index d5f86f8..a73c849 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -362,7 +362,7 @@
const uint8_t *references[] = { GetReference(0), GetReference(1),
GetReference(2), GetReference(3) };
- ASM_REGISTER_STATE_CHECK(GET_PARAM(2)(
+ API_REGISTER_STATE_CHECK(GET_PARAM(2)(
source_data_, source_stride_, references, reference_stride_, results));
}
@@ -397,7 +397,7 @@
const uint8_t *references[] = { GetReference(0), GetReference(1),
GetReference(2), GetReference(3) };
- ASM_REGISTER_STATE_CHECK(GET_PARAM(2)(
+ API_REGISTER_STATE_CHECK(GET_PARAM(2)(
source_data_, source_stride_, references, reference_stride_, results));
}
@@ -432,7 +432,7 @@
const uint8_t *references[] = { GetReference(0), GetReference(1),
GetReference(2), GetReference(3) };
- ASM_REGISTER_STATE_CHECK(GET_PARAM(2)(source_data_, source_stride_,
+ API_REGISTER_STATE_CHECK(GET_PARAM(2)(source_data_, source_stride_,
references, reference_stride_,
second_pred_, results));
}
@@ -468,7 +468,7 @@
unsigned int ret;
const uint8_t *const reference = GetReference(block_idx);
- ASM_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
+ API_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
reference, reference_stride_));
return ret;
}
@@ -499,7 +499,7 @@
unsigned int ret;
const uint8_t *const reference = GetReference(block_idx);
- ASM_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
+ API_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
reference, reference_stride_));
return ret;
}
@@ -530,7 +530,7 @@
unsigned int ret;
const uint8_t *const reference = GetReference(block_idx);
- ASM_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
+ API_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
reference, reference_stride_,
second_pred_));
return ret;
@@ -555,7 +555,7 @@
void dist_wtd_comp_avg(int block_idx) {
const uint8_t *const reference = GetReference(block_idx);
- ASM_REGISTER_STATE_CHECK(GET_PARAM(2)(comp_pred_test_, second_pred_, width_,
+ API_REGISTER_STATE_CHECK(GET_PARAM(2)(comp_pred_test_, second_pred_, width_,
height_, reference, reference_stride_,
&jcp_param_));
}
@@ -588,7 +588,7 @@
unsigned int ret;
const uint8_t *const reference = GetReference(block_idx);
- ASM_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
+ API_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
reference, reference_stride_,
GET_PARAM(0), GET_PARAM(1)));
return ret;
@@ -622,7 +622,7 @@
unsigned int ret;
const uint8_t *const reference = GetReference(block_idx);
- ASM_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
+ API_REGISTER_STATE_CHECK(ret = GET_PARAM(2)(source_data_, source_stride_,
reference, reference_stride_,
second_pred_, &jcp_param_));
return ret;
diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc
index ee91087..65fde3e 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -99,7 +99,7 @@
}
const uint64_t res_ref = params_.ref_func(src_, stride, width, height);
uint64_t res_tst;
- ASM_REGISTER_STATE_CHECK(res_tst =
+ API_REGISTER_STATE_CHECK(res_tst =
params_.tst_func(src_, stride, width, height));
if (!failed) {
@@ -204,7 +204,7 @@
const uint64_t ref_res = params_.ref_func(src, N);
uint64_t tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(src, N));
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(src, N));
ASSERT_EQ(ref_res, tst_res);
}
@@ -225,7 +225,7 @@
const uint64_t ref_res = params_.ref_func(src, N);
uint64_t tst_res;
- ASM_REGISTER_STATE_CHECK(tst_res = params_.tst_func(src, N));
+ API_REGISTER_STATE_CHECK(tst_res = params_.tst_func(src, N));
ASSERT_EQ(ref_res, tst_res);
}
@@ -640,7 +640,7 @@
const uint64_t res_ref = params_.ref_func(src_, stride, width, height);
uint64_t res_tst;
- ASM_REGISTER_STATE_CHECK(res_tst =
+ API_REGISTER_STATE_CHECK(res_tst =
params_.tst_func(src_, stride, width, height));
if (!failed) {
@@ -769,7 +769,7 @@
const uint64_t res_ref =
params_.ref_func(CONVERT_TO_BYTEPTR(src_), stride, width, height);
uint64_t res_tst;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
res_tst =
params_.tst_func(CONVERT_TO_BYTEPTR(src_), stride, width, height));
diff --git a/test/transform_test_base.h b/test/transform_test_base.h
index 68f5cc7..6897967 100644
--- a/test/transform_test_base.h
+++ b/test/transform_test_base.h
@@ -80,12 +80,12 @@
}
}
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
RunFwdTxfm(test_input_block, test_temp_block, pitch_));
if (bit_depth_ == AOM_BITS_8) {
- ASM_REGISTER_STATE_CHECK(RunInvTxfm(test_temp_block, dst, pitch_));
+ API_REGISTER_STATE_CHECK(RunInvTxfm(test_temp_block, dst, pitch_));
} else {
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
RunInvTxfm(test_temp_block, CONVERT_TO_BYTEPTR(dst16), pitch_));
}
@@ -148,7 +148,7 @@
}
fwd_txfm_ref(input_block, output_ref_block, stride, &txfm_param_);
- ASM_REGISTER_STATE_CHECK(RunFwdTxfm(input_block, output_block, stride));
+ API_REGISTER_STATE_CHECK(RunFwdTxfm(input_block, output_block, stride));
// The minimum quant value is 4.
for (j = 0; j < height_; ++j) {
@@ -198,7 +198,7 @@
fwd_txfm_ref(input_block, trans_block, pitch_, &txfm_param_);
inv_txfm_ref(trans_block, output_ref_block, stride, &txfm_param_);
- ASM_REGISTER_STATE_CHECK(RunInvTxfm(trans_block, output_block, stride));
+ API_REGISTER_STATE_CHECK(RunInvTxfm(trans_block, output_block, stride));
for (j = 0; j < height_; ++j) {
for (k = 0; k < pitch_; ++k) {
@@ -238,7 +238,7 @@
}
fwd_txfm_ref(input_extreme_block, output_ref_block, pitch_, &txfm_param_);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
RunFwdTxfm(input_extreme_block, output_block, pitch_));
int row_length = FindRowLength();
@@ -292,9 +292,9 @@
fwd_txfm_ref(in, coeff, pitch_, &txfm_param_);
if (bit_depth_ == AOM_BITS_8) {
- ASM_REGISTER_STATE_CHECK(RunInvTxfm(coeff, dst, pitch_));
+ API_REGISTER_STATE_CHECK(RunInvTxfm(coeff, dst, pitch_));
} else {
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
RunInvTxfm(coeff, CONVERT_TO_BYTEPTR(dst16), pitch_));
}
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 4e26118..61a3fdf 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -354,7 +354,7 @@
for (int i = 0; i < 256; ++i) {
mem[i] = v;
}
- ASM_REGISTER_STATE_CHECK(res = func_(mem));
+ API_REGISTER_STATE_CHECK(res = func_(mem));
EXPECT_EQ(256u * (v * v), res);
}
}
@@ -368,7 +368,7 @@
const unsigned int expected = mb_ss_ref(mem);
unsigned int res;
- ASM_REGISTER_STATE_CHECK(res = func_(mem));
+ API_REGISTER_STATE_CHECK(res = func_(mem));
EXPECT_EQ(expected, res);
}
}
@@ -501,9 +501,9 @@
dst_[k] = rnd_.Rand8();
src_[k] = rnd_.Rand8();
}
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
mse_ref = aom_mse_wxh_16bit_c(dst_, dstride, src_, sstride, w, h));
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
mse_mod = params_.func(dst_, dstride, src_, sstride, w, h));
EXPECT_EQ(mse_ref, mse_mod)
<< "ref mse: " << mse_ref << " mod mse: " << mse_mod;
@@ -599,7 +599,7 @@
for (int k = 0; k < block_size(); ++k) ref16[k] = j << byte_shift();
}
unsigned int sse, var;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var = params_.func(src_, width(), ref_, width(), &sse));
EXPECT_EQ(0u, var) << "src values: " << i << " ref values: " << j;
}
@@ -620,7 +620,7 @@
}
unsigned int sse1, sse2, var1, var2;
const int stride = width();
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var1 = params_.func(src_, stride, ref_, stride, &sse1));
var2 =
variance_ref(src_, ref_, params_.log2width, params_.log2height, stride,
@@ -649,7 +649,7 @@
unsigned int sse1, sse2;
unsigned int var1, var2;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var1 = params_.func(src_, src_stride, ref_, ref_stride, &sse1));
var2 = variance_ref(src_, ref_, params_.log2width, params_.log2height,
src_stride, ref_stride, &sse2, use_high_bit_depth(),
@@ -672,7 +672,7 @@
aom_memset16(CONVERT_TO_SHORTPTR(ref_) + half, 0, half);
}
unsigned int sse, var, expected;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var = params_.func(src_, width(), ref_, width(), &sse));
expected = block_size() * 255 * 255 / 4;
EXPECT_EQ(expected, var);
@@ -716,7 +716,7 @@
}
unsigned int sse1, sse2;
const int stride = width();
- ASM_REGISTER_STATE_CHECK(params_.func(src_, stride, ref_, stride, &sse1));
+ API_REGISTER_STATE_CHECK(params_.func(src_, stride, ref_, stride, &sse1));
variance_ref(src_, ref_, params_.log2width, params_.log2height, stride,
stride, &sse2, false, AOM_BITS_8);
EXPECT_EQ(sse1, sse2);
@@ -733,7 +733,7 @@
unsigned int sse2;
unsigned int var1;
const int stride = width();
- ASM_REGISTER_STATE_CHECK(var1 = params_.func(src_, stride, ref_, stride));
+ API_REGISTER_STATE_CHECK(var1 = params_.func(src_, stride, ref_, stride));
variance_ref(src_, ref_, params_.log2width, params_.log2height, stride,
stride, &sse2, false, AOM_BITS_8);
EXPECT_EQ(var1, sse2);
@@ -745,7 +745,7 @@
memset(src_, 255, block_size());
memset(ref_, 0, block_size());
unsigned int sse;
- ASM_REGISTER_STATE_CHECK(params_.func(src_, width(), ref_, width(), &sse));
+ API_REGISTER_STATE_CHECK(params_.func(src_, width(), ref_, width(), &sse));
const unsigned int expected = block_size() * 255 * 255;
EXPECT_EQ(expected, sse);
}
@@ -755,7 +755,7 @@
memset(src_, 255, block_size());
memset(ref_, 0, block_size());
unsigned int var;
- ASM_REGISTER_STATE_CHECK(var = params_.func(src_, width(), ref_, width()));
+ API_REGISTER_STATE_CHECK(var = params_.func(src_, width(), ref_, width()));
const unsigned int expected = block_size() * 255 * 255;
EXPECT_EQ(expected, var);
}
@@ -846,7 +846,7 @@
}
unsigned int sse1, sse2;
unsigned int var1;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var1 = params_.func(ref_, width() + 1, x, y, src_, width(), &sse1));
const unsigned int var2 = subpel_variance_ref(
ref_, src_, params_.log2width, params_.log2height, x, y, &sse2,
@@ -879,7 +879,7 @@
}
unsigned int sse1, sse2;
unsigned int var1;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var1 = params_.func(ref_, width() + 1, x, y, src_, width(), &sse1));
const unsigned int var2 = subpel_variance_ref(
ref_, src_, params_.log2width, params_.log2height, x, y, &sse2,
@@ -964,7 +964,7 @@
}
uint32_t sse1, sse2;
uint32_t var1, var2;
- ASM_REGISTER_STATE_CHECK(var1 = params_.func(ref_, width() + 1, x, y,
+ API_REGISTER_STATE_CHECK(var1 = params_.func(ref_, width() + 1, x, y,
src_, width(), &sse1, sec_));
var2 = subpel_avg_variance_ref(ref_, src_, sec_, params_.log2width,
params_.log2height, x, y, &sse2,
@@ -1002,7 +1002,7 @@
uint32_t var1, var2;
jcp_param_.fwd_offset = quant_dist_lookup_table[y0][x0];
jcp_param_.bck_offset = quant_dist_lookup_table[y0][1 - x0];
- ASM_REGISTER_STATE_CHECK(var1 = params_.func(ref_, width() + 0, x, y,
+ API_REGISTER_STATE_CHECK(var1 = params_.func(ref_, width() + 0, x, y,
src_, width(), &sse1,
sec_, &jcp_param_));
var2 = dist_wtd_subpel_avg_variance_ref(
@@ -1095,7 +1095,7 @@
uint32_t sse1, sse2;
uint32_t var1, var2;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var1 = params_.func(pre_, width() + 1, x, y, wsrc_, mask_, &sse1));
var2 = obmc_subpel_variance_ref(
pre_, params_.log2width, params_.log2height, x, y, wsrc_, mask_,
@@ -1132,7 +1132,7 @@
uint32_t sse1, sse2;
uint32_t var1, var2;
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
var1 = params_.func(pre_, width() + 1, x, y, wsrc_, mask_, &sse1));
var2 = obmc_subpel_variance_ref(
pre_, params_.log2width, params_.log2height, x, y, wsrc_, mask_,
@@ -1164,7 +1164,7 @@
for (int i = 0; i < run_time; ++i) {
int x = rnd_(8);
int y = rnd_(8);
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
params_.func(pre_, stride, x, y, wsrc_, mask_, &sse1));
}
aom_usec_timer_mark(&timer);
@@ -1495,9 +1495,9 @@
dst_[k] = rnd_.Rand16() & mask();
src_[k] = rnd_.Rand16() & mask();
}
- ASM_REGISTER_STATE_CHECK(mse_ref = aom_mse_wxh_16bit_highbd_c(
+ API_REGISTER_STATE_CHECK(mse_ref = aom_mse_wxh_16bit_highbd_c(
dst_, dstride, src_, sstride, w, h));
- ASM_REGISTER_STATE_CHECK(
+ API_REGISTER_STATE_CHECK(
mse_mod = params_.func(dst_, dstride, src_, sstride, w, h));
EXPECT_EQ(mse_ref, mse_mod)
<< "ref mse: " << mse_ref << " mod mse: " << mse_mod;
