Remove ClearSystemState from unit tests
BUG=aomedia:2968
Change-Id: Id38d17652fbf96a128d0d0416d0317b66a2ddbd0
diff --git a/test/av1_convolve_scale_test.cc b/test/av1_convolve_scale_test.cc
index 6530014..818ca74 100644
--- a/test/av1_convolve_scale_test.cc
+++ b/test/av1_convolve_scale_test.cc
@@ -18,7 +18,6 @@
#include "aom_ports/aom_timer.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -258,7 +257,7 @@
public:
ConvolveScaleTestBase() : image_(NULL) {}
virtual ~ConvolveScaleTestBase() { delete image_; }
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
// Implemented by subclasses (SetUp depends on the parameters passed
// in and RunOne depends on the function to be tested. These can't
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index 4d61f02..accee58 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -15,7 +15,6 @@
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "aom_ports/aom_timer.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -190,7 +189,7 @@
rnd_.Reset(libaom_test::ACMRandom::DeterministicSeed());
}
- virtual void TearDown() override { libaom_test::ClearSystemState(); }
+ virtual void TearDown() override {}
// Randomizes the 8-bit input buffer and returns a pointer to it. Note that
// the pointer is safe to use with an 8-tap filter. The stride can range
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 137cd09..40cc663 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -17,7 +17,6 @@
#include "test/acm_random.h"
#include "test/av1_txfm_test.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "av1/common/enums.h"
@@ -94,7 +93,6 @@
aom_free(coeffs_);
aom_free(output_);
aom_free(output_ref_);
- libaom_test::ClearSystemState();
}
protected:
diff --git a/test/av1_horz_only_frame_superres_test.cc b/test/av1_horz_only_frame_superres_test.cc
index 115fc84..2816226 100644
--- a/test/av1_horz_only_frame_superres_test.cc
+++ b/test/av1_horz_only_frame_superres_test.cc
@@ -20,7 +20,6 @@
#include "av1/common/convolve.h"
#include "av1/common/resize.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -164,7 +163,7 @@
public:
ConvolveHorizRSTestBase() : image_(NULL) {}
virtual ~ConvolveHorizRSTestBase() {}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
// Implemented by subclasses (SetUp depends on the parameters passed
// in and RunOne depends on the function to be tested. These can't
diff --git a/test/av1_k_means_test.cc b/test/av1_k_means_test.cc
index d55c692..ed0c6a6 100644
--- a/test/av1_k_means_test.cc
+++ b/test/av1_k_means_test.cc
@@ -23,7 +23,6 @@
#include "aom_ports/mem.h"
#include "test/acm_random.h"
#include "av1/encoder/palette.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -86,7 +85,7 @@
}
}
-void AV1KmeansTest1::TearDown() { libaom_test::ClearSystemState(); }
+void AV1KmeansTest1::TearDown() {}
void AV1KmeansTest1::RunCheckOutput(av1_calc_indices_dim1_func test_impl,
BLOCK_SIZE bsize, int k) {
@@ -194,7 +193,7 @@
}
}
-void AV1KmeansTest2::TearDown() { libaom_test::ClearSystemState(); }
+void AV1KmeansTest2::TearDown() {}
void AV1KmeansTest2::RunCheckOutput(av1_calc_indices_dim2_func test_impl,
BLOCK_SIZE bsize, int k) {
diff --git a/test/av1_nn_predict_test.cc b/test/av1_nn_predict_test.cc
index 2a88027..7a3067d 100644
--- a/test/av1_nn_predict_test.cc
+++ b/test/av1_nn_predict_test.cc
@@ -22,7 +22,6 @@
#include "test/util.h"
#include "test/register_state_check.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
namespace {
typedef void (*NnPredict_Func)(const float *const input_nodes,
@@ -73,7 +72,6 @@
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NnPredictTest);
void NnPredictTest::RunNnPredictTest(const NN_CONFIG *const shape) {
- libaom_test::ClearSystemState();
float inputs[NN_MAX_NODES_PER_LAYER] = { 0 };
float outputs_test[NN_MAX_NODES_PER_LAYER] = { 0 };
float outputs_ref[NN_MAX_NODES_PER_LAYER] = { 0 };
@@ -120,7 +118,6 @@
av1_nn_predict_c(inputs, &nn_config, 0, outputs_ref);
target_func_(inputs, &nn_config, 0, outputs_test);
- libaom_test::ClearSystemState();
for (int node = 0; node < shape->num_outputs; node++) {
if (outputs_ref[node] < epsilon) {
@@ -140,7 +137,6 @@
void NnPredictTest::RunNnPredictSpeedTest(const NN_CONFIG *const shape,
const int run_times) {
- libaom_test::ClearSystemState();
float inputs[NN_MAX_NODES_PER_LAYER] = { 0 };
float outputs_test[NN_MAX_NODES_PER_LAYER] = { 0 };
float outputs_ref[NN_MAX_NODES_PER_LAYER] = { 0 };
@@ -167,7 +163,6 @@
target_func_(inputs, &nn_config, 0, outputs_test);
}
aom_usec_timer_mark(&timer);
- libaom_test::ClearSystemState();
const double time2 = static_cast<double>(aom_usec_timer_elapsed(&timer));
printf("%d", shape->num_inputs);
diff --git a/test/av1_quantize_test.cc b/test/av1_quantize_test.cc
index bfb684e..870d153 100644
--- a/test/av1_quantize_test.cc
+++ b/test/av1_quantize_test.cc
@@ -16,7 +16,6 @@
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "av1/common/scan.h"
#include "av1/encoder/av1_quantize.h"
@@ -186,7 +185,7 @@
virtual void SetUp() { params_ = GetParam(); }
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
virtual ~AV1QuantizeTest() {}
diff --git a/test/av1_round_shift_array_test.cc b/test/av1_round_shift_array_test.cc
index 07f6b56..effac7e 100644
--- a/test/av1_round_shift_array_test.cc
+++ b/test/av1_round_shift_array_test.cc
@@ -20,7 +20,6 @@
#include "aom_ports/aom_timer.h"
#include "aom_ports/mem.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/util.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -43,7 +42,7 @@
~AV1CompRoundShiftTest();
void SetUp() { rnd_.Reset(libaom_test::ACMRandom::DeterministicSeed()); }
- void TearDown() { libaom_test::ClearSystemState(); }
+ void TearDown() {}
protected:
void RunCheckOutput(comp_round_shift_array_func test_impl, BLOCK_SIZE bsize,
diff --git a/test/av1_temporal_denoiser_test.cc b/test/av1_temporal_denoiser_test.cc
index 235a31c..bf27571 100644
--- a/test/av1_temporal_denoiser_test.cc
+++ b/test/av1_temporal_denoiser_test.cc
@@ -17,7 +17,6 @@
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/util.h"
#include "test/register_state_check.h"
@@ -48,7 +47,7 @@
virtual void SetUp() { bs_ = GET_PARAM(1); }
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
BLOCK_SIZE bs_;
diff --git a/test/avg_test.cc b/test/avg_test.cc
index f5c9212..d9e42d4 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -16,7 +16,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -34,7 +33,6 @@
virtual void TearDown() {
aom_free(source_data_);
source_data_ = NULL;
- libaom_test::ClearSystemState();
}
protected:
@@ -338,7 +336,6 @@
ref_vector = NULL;
aom_free(src_vector);
src_vector = NULL;
- libaom_test::ClearSystemState();
}
void FillConstant(int16_t fill_constant_ref, int16_t fill_constant_src) {
@@ -538,10 +535,7 @@
aom_memalign(32, sizeof(*src_) * satd_size_));
ASSERT_TRUE(src_ != NULL);
}
- virtual void TearDown() {
- libaom_test::ClearSystemState();
- aom_free(src_);
- }
+ virtual void TearDown() { aom_free(src_); }
void FillConstant(const tran_low_t val) {
for (int i = 0; i < satd_size_; ++i) src_[i] = val;
}
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index 14fa12b..da76a1d 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -21,7 +21,6 @@
#include "aom_ports/aom_timer.h"
#include "av1/common/cdef_block.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -44,7 +43,7 @@
depth = GET_PARAM(4);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
int bsize;
@@ -198,7 +197,7 @@
ref_finddir = GET_PARAM(1);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
find_dir_t finddir;
diff --git a/test/clear_system_state.h b/test/clear_system_state.h
deleted file mode 100644
index 8a81ac6..0000000
--- a/test/clear_system_state.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016, Alliance for Open Media. All rights reserved
- *
- * This source code is subject to the terms of the BSD 2 Clause License and
- * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
- * was not distributed with this source code in the LICENSE file, you can
- * obtain it at www.aomedia.org/license/software. If the Alliance for Open
- * Media Patent License 1.0 was not distributed with this source code in the
- * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
- */
-#ifndef AOM_TEST_CLEAR_SYSTEM_STATE_H_
-#define AOM_TEST_CLEAR_SYSTEM_STATE_H_
-
-#include "config/aom_config.h"
-
-#if ARCH_X86 || ARCH_X86_64
-#include "aom_ports/x86.h"
-#endif
-
-namespace libaom_test {
-
-// Reset system to a known state. This function should be used for all non-API
-// test cases.
-inline void ClearSystemState() {}
-
-} // namespace libaom_test
-#endif // AOM_TEST_CLEAR_SYSTEM_STATE_H_
diff --git a/test/comp_avg_pred_test.h b/test/comp_avg_pred_test.h
index f2fee6d..cc3b5a3 100644
--- a/test/comp_avg_pred_test.h
+++ b/test/comp_avg_pred_test.h
@@ -19,7 +19,6 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "av1/common/common_data.h"
#include "aom_ports/aom_timer.h"
@@ -92,7 +91,6 @@
public:
~AV1DISTWTDCOMPAVGTest() {}
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
- void TearDown() { libaom_test::ClearSystemState(); }
protected:
void RunCheckOutput(distwtdcompavg_func test_impl) {
@@ -196,7 +194,6 @@
public:
~AV1DISTWTDCOMPAVGUPSAMPLEDTest() {}
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
- void TearDown() { libaom_test::ClearSystemState(); }
protected:
void RunCheckOutput(distwtdcompavgupsampled_func test_impl) {
@@ -325,8 +322,6 @@
~AV1HighBDDISTWTDCOMPAVGTest() {}
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
- void TearDown() { libaom_test::ClearSystemState(); }
-
protected:
void RunCheckOutput(distwtdcompavg_func test_impl) {
const int w = kMaxSize, h = kMaxSize;
@@ -435,7 +430,6 @@
public:
~AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest() {}
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
- void TearDown() { libaom_test::ClearSystemState(); }
protected:
void RunCheckOutput(highbddistwtdcompavgupsampled_func test_impl) {
diff --git a/test/comp_mask_variance_test.cc b/test/comp_mask_variance_test.cc
index b8ee74c..8c09c85 100644
--- a/test/comp_mask_variance_test.cc
+++ b/test/comp_mask_variance_test.cc
@@ -24,7 +24,6 @@
#include "aom_ports/mem.h"
#include "av1/common/reconinter.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -102,7 +101,6 @@
aom_free(comp_pred2_);
aom_free(pred_);
aom_free(ref_buffer_);
- libaom_test::ClearSystemState();
}
void AV1CompMaskVarianceTest::RunCheckOutput(comp_mask_pred_func test_impl,
@@ -344,7 +342,6 @@
aom_free(comp_pred2_);
aom_free(pred_);
aom_free(ref_buffer_);
- libaom_test::ClearSystemState();
}
void AV1HighbdCompMaskVarianceTest::RunCheckOutput(
diff --git a/test/convolve_round_test.cc b/test/convolve_round_test.cc
index 4f17b54..9a05f1c 100644
--- a/test/convolve_round_test.cc
+++ b/test/convolve_round_test.cc
@@ -17,7 +17,6 @@
#include "aom/aom_integer.h"
#include "aom_ports/aom_timer.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index f4f8f39..2cfcab9 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -24,7 +24,6 @@
#include "aom_ports/mem.h"
#include "av1/common/filter.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -290,7 +289,7 @@
aom_memalign(kDataAlignment, (kOutputBufferSize) * sizeof(uint16_t)));
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
static void TearDownTestSuite() {
aom_free(input_ - 1);
diff --git a/test/corner_match_test.cc b/test/corner_match_test.cc
index 9c3a2b9..dc82055 100644
--- a/test/corner_match_test.cc
+++ b/test/corner_match_test.cc
@@ -15,7 +15,6 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "av1/encoder/corner_match.h"
@@ -54,7 +53,7 @@
rnd_.Reset(ACMRandom::DeterministicSeed());
target_func = GET_PARAM(1);
}
-void AV1CornerMatchTest::TearDown() { libaom_test::ClearSystemState(); }
+void AV1CornerMatchTest::TearDown() {}
void AV1CornerMatchTest::RunCheckOutput(int run_times) {
const int w = 128, h = 128;
diff --git a/test/dr_prediction_test.cc b/test/dr_prediction_test.cc
index 3e09912..4ad0a7f 100644
--- a/test/dr_prediction_test.cc
+++ b/test/dr_prediction_test.cc
@@ -22,7 +22,6 @@
#include "av1/common/pred_common.h"
#include "av1/common/reconintra.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index 61838ca..ecb9f73 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -26,7 +26,6 @@
#include "av1/common/scan.h"
#include "av1/common/txb_common.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -57,7 +56,6 @@
virtual void TearDown() {
aom_free(coeff_contexts_ref_);
aom_free(coeff_contexts_);
- libaom_test::ClearSystemState();
}
void GetNzMapContextsRun() {
@@ -214,7 +212,7 @@
: public ::testing::TestWithParam<TxbInitLevelParam> {
public:
virtual ~EncodeTxbInitLevelTest() {}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
void RunTest(av1_txb_init_levels_func test_func, int tx_size, int is_speed);
};
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EncodeTxbInitLevelTest);
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index ea0acf4..05966ee 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -20,7 +20,6 @@
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "av1/common/entropy.h"
@@ -60,7 +59,7 @@
bit_depth_ = GET_PARAM(2);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
aom_bit_depth_t bit_depth_;
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 69e4bda..046d810 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -20,7 +20,6 @@
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/transform_test_base.h"
#include "test/util.h"
@@ -72,7 +71,7 @@
TxfmBaseOutType::mask_ = (1 << TxfmBaseOutType::bit_depth_) - 1;
TxfmBaseOutType::num_coeffs_ = std::get<3>(this->GetParam());
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
void RunFwdTxfm(const int16_t *in, OutputType *out, int stride) {
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index 14cdd39..7418f67 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_test.cc
@@ -16,7 +16,6 @@
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "av1/common/enums.h"
@@ -59,7 +58,6 @@
delete[] alloc_;
delete[] predRef_;
delete[] pred_;
- libaom_test::ClearSystemState();
}
protected:
diff --git a/test/frame_error_test.cc b/test/frame_error_test.cc
index 6478f09..7acda9f 100644
--- a/test/frame_error_test.cc
+++ b/test/frame_error_test.cc
@@ -20,7 +20,6 @@
#include "aom_ports/aom_timer.h"
#include "aom_ports/mem.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/util.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -44,7 +43,7 @@
virtual void SetUp() {
rnd_.Reset(libaom_test::ACMRandom::DeterministicSeed());
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
void RandomValues(frame_error_func test_impl, int width, int height);
diff --git a/test/function_equivalence_test.h b/test/function_equivalence_test.h
index a299c48..a7116b1 100644
--- a/test/function_equivalence_test.h
+++ b/test/function_equivalence_test.h
@@ -16,7 +16,6 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/util.h"
using libaom_test::ACMRandom;
@@ -60,7 +59,7 @@
virtual void SetUp() { params_ = this->GetParam(); }
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
ACMRandom rng_;
diff --git a/test/fwht4x4_test.cc b/test/fwht4x4_test.cc
index 23a9fe5..ed6589b 100644
--- a/test/fwht4x4_test.cc
+++ b/test/fwht4x4_test.cc
@@ -20,7 +20,6 @@
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/transform_test_base.h"
#include "test/util.h"
@@ -69,7 +68,7 @@
num_coeffs_ = GET_PARAM(4);
fwd_txfm_c_ = GET_PARAM(5);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
void RunFwdTxfm(const int16_t *in, tran_low_t *out, int stride) {
diff --git a/test/hadamard_test.cc b/test/hadamard_test.cc
index 7903259..07776b2 100644
--- a/test/hadamard_test.cc
+++ b/test/hadamard_test.cc
@@ -16,7 +16,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
diff --git a/test/hiprec_convolve_test_util.cc b/test/hiprec_convolve_test_util.cc
index 956af7f..04e16bc 100644
--- a/test/hiprec_convolve_test_util.cc
+++ b/test/hiprec_convolve_test_util.cc
@@ -85,7 +85,7 @@
rnd_.Reset(ACMRandom::DeterministicSeed());
}
-void AV1HiprecConvolveTest::TearDown() { libaom_test::ClearSystemState(); }
+void AV1HiprecConvolveTest::TearDown() {}
void AV1HiprecConvolveTest::RunCheckOutput(hiprec_convolve_func test_impl) {
const int w = 128, h = 128;
@@ -220,9 +220,7 @@
rnd_.Reset(ACMRandom::DeterministicSeed());
}
-void AV1HighbdHiprecConvolveTest::TearDown() {
- libaom_test::ClearSystemState();
-}
+void AV1HighbdHiprecConvolveTest::TearDown() {}
void AV1HighbdHiprecConvolveTest::RunCheckOutput(
highbd_hiprec_convolve_func test_impl) {
diff --git a/test/hiprec_convolve_test_util.h b/test/hiprec_convolve_test_util.h
index 6b6da4e..e064ba6 100644
--- a/test/hiprec_convolve_test_util.h
+++ b/test/hiprec_convolve_test_util.h
@@ -18,7 +18,6 @@
#include "test/acm_random.h"
#include "test/util.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index b04ab50..f6316f1 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -17,7 +17,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "av1/common/blockd.h"
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index a30d02d..cf42967 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -20,7 +20,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "av1/common/av1_loopfilter.h"
@@ -136,7 +135,7 @@
mask_ = (1 << bit_depth_) - 1;
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
int bit_depth_;
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index df7b3f8..3bc7c5c 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -15,7 +15,6 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -59,7 +58,7 @@
int msk_stride, int inv_mask, unsigned sads[],
int times) = 0;
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
void runMaskedSADTest(int run_times);
};
@@ -254,7 +253,7 @@
ref_maskedSAD_op_ = GET_PARAM(1);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
void runHighbdMaskedSADTest(int run_times);
protected:
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index afffce9..aaf675a 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -16,7 +16,6 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -50,7 +49,7 @@
ref_func_ = GET_PARAM(1);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
MaskedSubPixelVarianceFunc opt_func_;
@@ -187,7 +186,7 @@
bit_depth_ = GET_PARAM(2);
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
MaskedSubPixelVarianceFunc opt_func_;
diff --git a/test/quantize_func_test.cc b/test/quantize_func_test.cc
index 3523050..0d8dca3 100644
--- a/test/quantize_func_test.cc
+++ b/test/quantize_func_test.cc
@@ -22,7 +22,6 @@
#include "av1/encoder/encoder.h"
#include "av1/common/scan.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -100,7 +99,6 @@
qtab_ = NULL;
aom_free(coeff_);
coeff_ = NULL;
- libaom_test::ClearSystemState();
}
void InitQuantizer() {
diff --git a/test/reconinter_test.cc b/test/reconinter_test.cc
index 7e440c9..ec97db7 100644
--- a/test/reconinter_test.cc
+++ b/test/reconinter_test.cc
@@ -21,7 +21,6 @@
#include "av1/common/scan.h"
#include "av1/common/txb_common.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
@@ -51,7 +50,7 @@
public:
virtual ~BuildCompDiffwtdMaskTest() {}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
void RunTest(buildcompdiffwtdmaskd_func test_impl, const int is_speed,
const DIFFWTD_MASK_TYPE type);
@@ -79,7 +78,7 @@
: public ::testing::TestWithParam<BuildCompDiffwtdMaskD16Param> {
public:
~BuildCompDiffwtdMaskD16Test() {}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
protected:
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 037ed24..d5f86f8 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -20,7 +20,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "aom/aom_codec.h"
@@ -129,7 +128,7 @@
comp_pred16_test_ = NULL;
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
// Handle up to 4 128x128 blocks, with stride up to 256
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index 48ec461..94e89ae 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -17,7 +17,6 @@
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
@@ -45,7 +44,7 @@
virtual ~AV1SelfguidedFilterTest() {}
virtual void SetUp() {}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
void RunSpeedTest() {
@@ -231,7 +230,7 @@
virtual ~AV1HighbdSelfguidedFilterTest() {}
virtual void SetUp() {}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
void RunSpeedTest() {
diff --git a/test/simd_impl.h b/test/simd_impl.h
index 61fda00..8535e37 100644
--- a/test/simd_impl.h
+++ b/test/simd_impl.h
@@ -13,7 +13,6 @@
#define SIMD_CHECK 1
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "aom_dsp/aom_simd_inline.h"
#include "aom_dsp/simd/v256_intrinsics_c.h"
@@ -30,7 +29,7 @@
name = std::get<2>(this->GetParam());
}
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
protected:
uint32_t mask, maskwidth;
diff --git a/test/sse_sum_test.cc b/test/sse_sum_test.cc
index 3e24e89..ecb89e4 100644
--- a/test/sse_sum_test.cc
+++ b/test/sse_sum_test.cc
@@ -21,7 +21,6 @@
#include "aom_ports/mem.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "test/function_equivalence_test.h"
@@ -50,10 +49,7 @@
ASSERT_TRUE(src_ != NULL);
}
- virtual void TearDown() {
- libaom_test::ClearSystemState();
- aom_free(src_);
- }
+ virtual void TearDown() { aom_free(src_); }
void RunTest(int isRandom);
void RunSpeedTest();
diff --git a/test/subtract_test.cc b/test/subtract_test.cc
index 9ac56fc..65724e1 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -17,7 +17,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "av1/common/blockd.h"
@@ -33,7 +32,7 @@
class AV1SubtractBlockTest : public ::testing::TestWithParam<SubtractFunc> {
public:
- virtual void TearDown() { libaom_test::ClearSystemState(); }
+ virtual void TearDown() {}
};
using libaom_test::ACMRandom;
diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc
index 4f26a3d..ee91087 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -21,7 +21,6 @@
#include "aom_ports/mem.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "test/function_equivalence_test.h"
@@ -52,10 +51,7 @@
ASSERT_TRUE(src_ != NULL);
}
- virtual void TearDown() {
- libaom_test::ClearSystemState();
- aom_free(src_);
- }
+ virtual void TearDown() { aom_free(src_); }
void RunTest(int isRandom);
void RunSpeedTest();
@@ -268,7 +264,6 @@
}
virtual void TearDown() {
- libaom_test::ClearSystemState();
aom_free(src_);
aom_free(ref_);
}
@@ -453,10 +448,7 @@
ASSERT_TRUE(src_ != NULL);
}
- virtual void TearDown() {
- libaom_test::ClearSystemState();
- aom_free(src_);
- }
+ virtual void TearDown() { aom_free(src_); }
void RunTest(int isRandom, int width, int height, int run_times);
void GenRandomData(int width, int height, int stride) {
@@ -599,10 +591,7 @@
ASSERT_TRUE(src_ != NULL);
}
- virtual void TearDown() {
- libaom_test::ClearSystemState();
- aom_free(src_);
- }
+ virtual void TearDown() { aom_free(src_); }
void RunTest(int isRandom);
void RunSpeedTest();
@@ -730,10 +719,7 @@
ASSERT_TRUE(src_ != NULL);
}
- virtual void TearDown() {
- libaom_test::ClearSystemState();
- aom_free(src_);
- }
+ virtual void TearDown() { aom_free(src_); }
void RunTest(int isRandom);
void RunSpeedTest();
diff --git a/test/temporal_filter_test.cc b/test/temporal_filter_test.cc
index d665c85..6b933d8 100644
--- a/test/temporal_filter_test.cc
+++ b/test/temporal_filter_test.cc
@@ -24,7 +24,6 @@
#include "av1/encoder/encoder.h"
#include "av1/encoder/temporal_filter.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
#include "test/function_equivalence_test.h"
@@ -72,7 +71,6 @@
}
virtual void TearDown() {
- libaom_test::ClearSystemState();
aom_free(src1_);
aom_free(src2_);
}
@@ -325,7 +323,6 @@
}
virtual void TearDown() {
- libaom_test::ClearSystemState();
aom_free(src1_);
aom_free(src2_);
}
diff --git a/test/test.cmake b/test/test.cmake
index e61e871..0cd3c94 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -30,7 +30,6 @@
"${AOM_ROOT}/test/av1_config_test.cc"
"${AOM_ROOT}/test/av1_key_value_api_test.cc"
"${AOM_ROOT}/test/block_test.cc"
- "${AOM_ROOT}/test/clear_system_state.h"
"${AOM_ROOT}/test/codec_factory.h"
"${AOM_ROOT}/test/function_equivalence_test.h"
"${AOM_ROOT}/test/log2_test.cc"
diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index 54bdbcb..796477e 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -19,7 +19,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/md5_helper.h"
#include "aom/aom_integer.h"
#include "aom_ports/mem.h"
@@ -135,7 +134,6 @@
pred_funcs[k](intra_pred_test_mem.src, intra_pred_test_mem.stride,
intra_pred_test_mem.above, intra_pred_test_mem.left);
}
- libaom_test::ClearSystemState();
aom_usec_timer_mark(&timer);
const int elapsed_time =
static_cast<int>(aom_usec_timer_elapsed(&timer) / 1000);
@@ -945,7 +943,6 @@
pred_funcs[k](intra_pred_test_mem.src, intra_pred_test_mem.stride,
intra_pred_test_mem.above, intra_pred_test_mem.left, bd);
}
- libaom_test::ClearSystemState();
aom_usec_timer_mark(&timer);
const int elapsed_time =
static_cast<int>(aom_usec_timer_elapsed(&timer) / 1000);
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 6bb96ce..4e26118 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -20,7 +20,6 @@
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "aom/aom_codec.h"
#include "aom/aom_integer.h"
@@ -338,7 +337,7 @@
public:
SumOfSquaresTest() : func_(GetParam()) {}
- virtual ~SumOfSquaresTest() { libaom_test::ClearSystemState(); }
+ virtual ~SumOfSquaresTest() {}
protected:
void ConstTest();
@@ -434,7 +433,6 @@
aom_free(dst_);
src_ = NULL;
dst_ = NULL;
- libaom_test::ClearSystemState();
}
protected:
@@ -545,7 +543,6 @@
delete[] ref_;
src_ = NULL;
ref_ = NULL;
- libaom_test::ClearSystemState();
}
protected:
@@ -805,7 +802,6 @@
aom_free(CONVERT_TO_SHORTPTR(ref_));
aom_free(CONVERT_TO_SHORTPTR(sec_));
}
- libaom_test::ClearSystemState();
}
protected:
@@ -1060,7 +1056,6 @@
}
aom_free(wsrc_);
aom_free(mask_);
- libaom_test::ClearSystemState();
}
protected:
@@ -1433,7 +1428,6 @@
aom_free(dst_);
src_ = NULL;
dst_ = NULL;
- libaom_test::ClearSystemState();
}
protected:
diff --git a/test/warp_filter_test_util.cc b/test/warp_filter_test_util.cc
index 0e6e8b1..85fcb9c 100644
--- a/test/warp_filter_test_util.cc
+++ b/test/warp_filter_test_util.cc
@@ -109,7 +109,7 @@
AV1WarpFilterTest::~AV1WarpFilterTest() {}
void AV1WarpFilterTest::SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
-void AV1WarpFilterTest::TearDown() { libaom_test::ClearSystemState(); }
+void AV1WarpFilterTest::TearDown() {}
void AV1WarpFilterTest::RunSpeedTest(warp_affine_func test_impl) {
const int w = 128, h = 128;
@@ -301,7 +301,7 @@
rnd_.Reset(ACMRandom::DeterministicSeed());
}
-void AV1HighbdWarpFilterTest::TearDown() { libaom_test::ClearSystemState(); }
+void AV1HighbdWarpFilterTest::TearDown() {}
void AV1HighbdWarpFilterTest::RunSpeedTest(highbd_warp_affine_func test_impl) {
const int w = 128, h = 128;
diff --git a/test/warp_filter_test_util.h b/test/warp_filter_test_util.h
index 66a6e24..583f312 100644
--- a/test/warp_filter_test_util.h
+++ b/test/warp_filter_test_util.h
@@ -20,7 +20,6 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "av1/common/mv.h"
