Skip to content

Commit e4d3071

Browse files
grebecopybara-github
grebe
authored and
copybara-github
committed
Drop our aliases for QCHECK().
Now that Abseil has released logging, we are removing many of our macros in favor of the Abseil macros they alias. See also the github issue. Work towards #1318. PiperOrigin-RevId: 610789664
1 parent 9984073 commit e4d3071

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+188
-183
lines changed

‎third_party/xls_berkeley_softfloat/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ cc_test(
6060
tags = ["optonly"],
6161
deps = [
6262
":fpdiv_2x32_jit_wrapper",
63+
"@com_google_absl//absl/flags:flag",
6364
"@com_google_absl//absl/random",
6465
"@com_google_absl//absl/status",
6566
"@com_google_absl//absl/strings:str_format",

‎third_party/xls_berkeley_softfloat/fpdiv_2x32_test.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <cmath>
2828
#include <tuple>
2929

30+
#include "absl/flags/flag.h"
3031
#include "absl/random/random.h"
3132
#include "absl/status/status.h"
3233
#include "absl/strings/str_format.h"
@@ -118,8 +119,8 @@ absl::Status RealMain(bool use_opt_ir, uint64_t num_samples, int num_threads) {
118119

119120
int main(int argc, char** argv) {
120121
xls::InitXls(argv[0], argc, argv);
121-
XLS_QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_use_opt_ir),
122-
absl::GetFlag(FLAGS_num_samples),
123-
absl::GetFlag(FLAGS_num_threads)));
122+
QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_use_opt_ir),
123+
absl::GetFlag(FLAGS_num_samples),
124+
absl::GetFlag(FLAGS_num_threads)));
124125
return 0;
125126
}

‎third_party/xls_go_math/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ cc_test(
7878
tags = ["optonly"],
7979
deps = [
8080
":fpexp_32_jit_wrapper",
81+
"@com_google_absl//absl/flags:flag",
8182
"@com_google_absl//absl/random",
8283
"@com_google_absl//absl/status",
8384
"//xls/common:init_xls",
@@ -150,6 +151,7 @@ cc_test(
150151
tags = ["optonly"],
151152
deps = [
152153
":fp_sincos_32_jit_wrapper",
154+
"@com_google_absl//absl/flags:flag",
153155
"@com_google_absl//absl/random",
154156
"@com_google_absl//absl/status",
155157
"//xls/common:init_xls",
@@ -214,6 +216,7 @@ cc_test(
214216
tags = ["optonly"],
215217
deps = [
216218
":fp_trig_reduce_jit_wrapper",
219+
"@com_google_absl//absl/flags:flag",
217220
"@com_google_absl//absl/numeric:int128",
218221
"@com_google_absl//absl/random",
219222
"@com_google_absl//absl/status",
@@ -275,6 +278,7 @@ cc_test(
275278
tags = ["optonly"],
276279
deps = [
277280
":fpsqrt_32_jit_wrapper",
281+
"@com_google_absl//absl/flags:flag",
278282
"@com_google_absl//absl/random",
279283
"@com_google_absl//absl/status",
280284
"//xls/common:init_xls",

‎third_party/xls_go_math/fp_sincos_32_test.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <cmath>
88
#include <tuple>
99

10+
#include "absl/flags/flag.h"
1011
#include "absl/random/random.h"
1112
#include "absl/status/status.h"
1213
#include "xls/common/file/get_runfile_path.h"
@@ -120,7 +121,7 @@ absl::Status RealMain(uint32_t num_samples, int num_threads) {
120121

121122
int main(int argc, char** argv) {
122123
xls::InitXls(argv[0], argc, argv);
123-
XLS_QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_num_samples),
124-
absl::GetFlag(FLAGS_num_threads)));
124+
QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_num_samples),
125+
absl::GetFlag(FLAGS_num_threads)));
125126
return 0;
126127
}

‎third_party/xls_go_math/fp_trig_reduce_64_test.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <cmath>
99
#include <tuple>
1010

11+
#include "absl/flags/flag.h"
1112
#include "absl/numeric/int128.h"
1213
#include "absl/random/random.h"
1314
#include "absl/status/status.h"
@@ -205,8 +206,8 @@ absl::Status RealMain(bool use_opt_ir, uint64_t num_samples, int num_threads) {
205206

206207
int main(int argc, char** argv) {
207208
xls::InitXls(argv[0], argc, argv);
208-
XLS_QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_use_opt_ir),
209-
absl::GetFlag(FLAGS_num_samples),
210-
absl::GetFlag(FLAGS_num_threads)));
209+
QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_use_opt_ir),
210+
absl::GetFlag(FLAGS_num_samples),
211+
absl::GetFlag(FLAGS_num_threads)));
211212
return 0;
212213
}

‎third_party/xls_go_math/fpexp_32_test.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <cmath>
77
#include <limits>
88

9+
#include "absl/flags/flag.h"
910
#include "absl/random/random.h"
1011
#include "absl/status/status.h"
1112
#include "xls/common/file/get_runfile_path.h"
@@ -96,7 +97,7 @@ absl::Status RealMain(uint64_t num_samples, int num_threads) {
9697

9798
int main(int argc, char** argv) {
9899
xls::InitXls(argv[0], argc, argv);
99-
XLS_QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_num_samples),
100-
absl::GetFlag(FLAGS_num_threads)));
100+
QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_num_samples),
101+
absl::GetFlag(FLAGS_num_threads)));
101102
return 0;
102103
}

‎third_party/xls_go_math/fpsqrt_32_test.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <cmath>
88
#include <limits>
99

10+
#include "absl/flags/flag.h"
1011
#include "absl/random/random.h"
1112
#include "absl/status/status.h"
1213
#include "xls/common/file/get_runfile_path.h"
@@ -73,7 +74,7 @@ absl::Status RealMain(uint64_t num_samples, int num_threads) {
7374

7475
int main(int argc, char** argv) {
7576
xls::InitXls(argv[0], argc, argv);
76-
XLS_QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_num_samples),
77-
absl::GetFlag(FLAGS_num_threads)));
77+
QCHECK_OK(xls::RealMain(absl::GetFlag(FLAGS_num_samples),
78+
absl::GetFlag(FLAGS_num_threads)));
7879
return 0;
7980
}

‎third_party/xls_machsuite/fft/fft_reference.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,6 @@ absl::Status RealMain() {
166166

167167
int main(int argc, char** argv) {
168168
xls::InitXls(argv[0], argc, argv);
169-
XLS_QCHECK_OK(xls::RealMain());
169+
QCHECK_OK(xls::RealMain());
170170
return 0;
171171
}

‎xls/common/logging/logging.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// Even seemingly unconditional statements like `XLS_LOG(INFO)` might be
3939
// disabled at compile-time to minimize binary size or for security reasons.
4040
//
41-
// * Except for the condition in a `XLS_CHECK` or `XLS_QCHECK` statement,
41+
// * Except for the condition in a `XLS_CHECK` or `QCHECK` statement,
4242
// programs must not rely on evaluation of expressions anywhere in logging
4343
// statements for correctness. For example, this is ok:
4444
//
@@ -221,16 +221,7 @@
221221
#define XLS_CHECK_GE(val1, val2) CHECK_GE(val1, val2)
222222
#define XLS_CHECK_GT(val1, val2) CHECK_GT(val1, val2)
223223

224-
#define XLS_QCHECK(condition) QCHECK(condition)
225-
#define XLS_QCHECK_EQ(val1, val2) QCHECK_EQ(val1, val2)
226-
#define XLS_QCHECK_NE(val1, val2) QCHECK_NE(val1, val2)
227-
#define XLS_QCHECK_LE(val1, val2) QCHECK_LE(val1, val2)
228-
#define XLS_QCHECK_LT(val1, val2) QCHECK_LT(val1, val2)
229-
#define XLS_QCHECK_GE(val1, val2) QCHECK_GE(val1, val2)
230-
#define XLS_QCHECK_GT(val1, val2) QCHECK_GT(val1, val2)
231-
232224
#define XLS_CHECK_OK(val) CHECK_OK(val)
233-
#define XLS_QCHECK_OK(val) QCHECK_OK(val)
234225

235226

236227
#endif // XLS_COMMON_LOGGING_LOGGING_H_

‎xls/common/logging/logging_test.cc

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ TEST_F(LoggingTest, CheckPrintsStackTraceWhenConditionFails) {
117117
}
118118

119119
TEST_F(LoggingTest, QcheckDoesNothingWhenConditionHolds) {
120-
XLS_QCHECK(true);
120+
QCHECK(true);
121121

122122
EXPECT_EQ(entries_.size(), 0);
123123
}
@@ -126,7 +126,7 @@ TEST_F(LoggingTest, QcheckCrashesWhenConditionFails) {
126126
EXPECT_DEATH(
127127
{
128128
bool condition_variable = false;
129-
XLS_QCHECK(condition_variable);
129+
QCHECK(condition_variable);
130130
},
131131
HasSubstr("condition_variable"));
132132
}
@@ -201,63 +201,63 @@ TEST_F(LoggingTest, CheckGtCrashesWhenConditionFails) {
201201
}
202202

203203
TEST_F(LoggingTest, QcheckEqDoesNothingWhenConditionHolds) {
204-
XLS_QCHECK_EQ(1, 1);
204+
QCHECK_EQ(1, 1);
205205

206206
EXPECT_EQ(entries_.size(), 0);
207207
}
208208

209209
TEST_F(LoggingTest, QcheckEqCrashesWhenConditionFails) {
210-
EXPECT_DEATH({ XLS_QCHECK_EQ(1, 2); }, HasSubstr("1 == 2"));
210+
EXPECT_DEATH({ QCHECK_EQ(1, 2); }, HasSubstr("1 == 2"));
211211
}
212212

213213
TEST_F(LoggingTest, QcheckNeDoesNothingWhenConditionHolds) {
214-
XLS_QCHECK_NE(1, 2);
214+
QCHECK_NE(1, 2);
215215

216216
EXPECT_EQ(entries_.size(), 0);
217217
}
218218

219219
TEST_F(LoggingTest, QcheckNeCrashesWhenConditionFails) {
220-
EXPECT_DEATH({ XLS_QCHECK_NE(1, 1); }, HasSubstr("1 != 1"));
220+
EXPECT_DEATH({ QCHECK_NE(1, 1); }, HasSubstr("1 != 1"));
221221
}
222222

223223
TEST_F(LoggingTest, QcheckLeDoesNothingWhenConditionHolds) {
224-
XLS_QCHECK_LE(1, 1);
224+
QCHECK_LE(1, 1);
225225

226226
EXPECT_EQ(entries_.size(), 0);
227227
}
228228

229229
TEST_F(LoggingTest, QcheckLeCrashesWhenConditionFails) {
230-
EXPECT_DEATH({ XLS_QCHECK_LE(2, 1); }, HasSubstr("2 <= 1"));
230+
EXPECT_DEATH({ QCHECK_LE(2, 1); }, HasSubstr("2 <= 1"));
231231
}
232232

233233
TEST_F(LoggingTest, QcheckLtDoesNothingWhenConditionHolds) {
234-
XLS_QCHECK_LT(1, 2);
234+
QCHECK_LT(1, 2);
235235

236236
EXPECT_EQ(entries_.size(), 0);
237237
}
238238

239239
TEST_F(LoggingTest, QcheckLtCrashesWhenConditionFails) {
240-
EXPECT_DEATH({ XLS_QCHECK_LT(1, 1); }, HasSubstr("1 < 1"));
240+
EXPECT_DEATH({ QCHECK_LT(1, 1); }, HasSubstr("1 < 1"));
241241
}
242242

243243
TEST_F(LoggingTest, QcheckGeDoesNothingWhenConditionHolds) {
244-
XLS_QCHECK_GE(1, 1);
244+
QCHECK_GE(1, 1);
245245

246246
EXPECT_EQ(entries_.size(), 0);
247247
}
248248

249249
TEST_F(LoggingTest, QcheckGeCrashesWhenConditionFails) {
250-
EXPECT_DEATH({ XLS_QCHECK_GE(1, 2); }, HasSubstr("1 >= 2"));
250+
EXPECT_DEATH({ QCHECK_GE(1, 2); }, HasSubstr("1 >= 2"));
251251
}
252252

253253
TEST_F(LoggingTest, QcheckGtDoesNothingWhenConditionHolds) {
254-
XLS_QCHECK_GT(2, 1);
254+
QCHECK_GT(2, 1);
255255

256256
EXPECT_EQ(entries_.size(), 0);
257257
}
258258

259259
TEST_F(LoggingTest, QcheckGtCrashesWhenConditionFails) {
260-
EXPECT_DEATH({ XLS_QCHECK_GT(1, 1); }, HasSubstr("1 > 1"));
260+
EXPECT_DEATH({ QCHECK_GT(1, 1); }, HasSubstr("1 > 1"));
261261
}
262262

263263
TEST_F(LoggingTest, CheckOkDoesNothingWithOkStatus) {
@@ -277,19 +277,20 @@ TEST_F(LoggingTest, CheckOkCrashesWithStackTrace) {
277277
}
278278

279279
TEST_F(LoggingTest, QcheckOkDoesNothingWithOkStatus) {
280-
XLS_QCHECK_OK(absl::OkStatus());
280+
QCHECK_OK(absl::OkStatus());
281281

282282
EXPECT_EQ(entries_.size(), 0);
283283
}
284284

285285
TEST_F(LoggingTest, QcheckOkCrashesWithNonOkStatus) {
286-
EXPECT_DEATH({ XLS_QCHECK_OK(absl::UnknownError("error_msg")); },
287-
HasSubstr("error_msg"));
286+
EXPECT_DEATH(
287+
{ QCHECK_OK(absl::UnknownError("error_msg")); }, HasSubstr("error_msg"));
288288
}
289289

290290
TEST_F(LoggingTest, QcheckOkCrashesWithoutStackTrace) {
291-
EXPECT_DEATH({ XLS_QCHECK_OK(absl::UnknownError("error_msg")); },
292-
Not(HasSubstr("CheckOkCrashesWithStackTrace")));
291+
EXPECT_DEATH(
292+
{ QCHECK_OK(absl::UnknownError("error_msg")); },
293+
Not(HasSubstr("CheckOkCrashesWithStackTrace")));
293294
}
294295

295296
} // namespace

‎xls/contrib/xlscc/xlscc_logging.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717

1818
#define XLSCC_CHECK(condition, loc) \
1919
XLS_CHECK(condition) << ErrorMessage(loc, "")
20-
#define XLSCC_QCHECK(condition, loc) \
21-
XLS_QCHECK(condition) << ErrorMessage(loc, "")
20+
#define XLSCC_QCHECK(condition, loc) QCHECK(condition) << ErrorMessage(loc, "")
2221
#define XLSCC_DCHECK(condition, loc) DCHECK(condition) << ErrorMessage(loc, "")
2322

2423
#define XLSCC_CHECK_EQ(val1, val2, loc) \
@@ -34,17 +33,17 @@
3433
#define XLSCC_CHECK_GT(val1, val2, loc) \
3534
XLS_CHECK_GT(val1, val2) << ErrorMessage(loc, "")
3635
#define XLSCC_QCHECK_EQ(val1, val2, loc) \
37-
XLS_QCHECK_EQ(val1, val2) << ErrorMessage(loc, "")
36+
QCHECK_EQ(val1, val2) << ErrorMessage(loc, "")
3837
#define XLSCC_QCHECK_NE(val1, val2, loc) \
39-
XLS_QCHECK_NE(val1, val2) << ErrorMessage(loc, "")
38+
QCHECK_NE(val1, val2) << ErrorMessage(loc, "")
4039
#define XLSCC_QCHECK_LE(val1, val2, loc) \
41-
XLS_QCHECK_LE(val1, val2) << ErrorMessage(loc, "")
40+
QCHECK_LE(val1, val2) << ErrorMessage(loc, "")
4241
#define XLSCC_QCHECK_LT(val1, val2, loc) \
43-
XLS_QCHECK_LT(val1, val2) << ErrorMessage(loc, "")
42+
QCHECK_LT(val1, val2) << ErrorMessage(loc, "")
4443
#define XLSCC_QCHECK_GE(val1, val2, loc) \
45-
XLS_QCHECK_GE(val1, val2) << ErrorMessage(loc, "")
44+
QCHECK_GE(val1, val2) << ErrorMessage(loc, "")
4645
#define XLSCC_QCHECK_GT(val1, val2, loc) \
47-
XLS_QCHECK_GT(val1, val2) << ErrorMessage(loc, "")
46+
QCHECK_GT(val1, val2) << ErrorMessage(loc, "")
4847

4948
#define XLSCC_DCHECK_EQ(val1, val2, loc) \
5049
XLSCC_CHECK_EQ(val1, val2) << ErrorMessage(loc, "")
@@ -60,7 +59,7 @@
6059
XLSCC_CHECK_GT(val1, val2) << ErrorMessage(loc, "")
6160

6261
#define XLSCC_CHECK_OK(val, loc) XLS_CHECK_EQ(val) << ErrorMessage(loc, "")
63-
#define XLSCC_QCHECK_OK(val, loc) XLS_QCHECK_EQ(val) << ErrorMessage(loc, "")
62+
#define XLSCC_QCHECK_OK(val, loc) QCHECK_EQ(val) << ErrorMessage(loc, "")
6463
#define XLSCC_DCHECK_OK(val, loc) DCHECK_EQ(val) << ErrorMessage(loc), ""
6564

6665
#endif // XLSCC_COMMON_LOGGING_LOGGING_H_

‎xls/dslx/bytecode/bytecode_interpreter.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,8 +1660,7 @@ absl::StatusOr<ProcRunResult> ProcInstance::Run() {
16601660
if (next_args_.size() == proc_->members().size() + 2) {
16611661
next_args_[proc_->members().size() + 1] = result_value;
16621662
} else {
1663-
XLS_QCHECK(result_value.IsTuple() &&
1664-
result_value.GetLength().value() == 0);
1663+
QCHECK(result_value.IsTuple() && result_value.GetLength().value() == 0);
16651664
}
16661665

16671666
XLS_RETURN_IF_ERROR(interpreter_->InitFrame(next_fn_.get(), next_args_,

‎xls/dslx/cpp_transpiler/cpp_transpiler_main.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ int main(int argc, char* argv[]) {
8888
}
8989

9090
std::string output_header_path = absl::GetFlag(FLAGS_output_header_path);
91-
XLS_QCHECK(!output_header_path.empty())
91+
QCHECK(!output_header_path.empty())
9292
<< "--output_header_path must be specified.";
9393
std::string output_source_path = absl::GetFlag(FLAGS_output_source_path);
94-
XLS_QCHECK(!output_source_path.empty())
94+
QCHECK(!output_source_path.empty())
9595
<< "--output_source_path must be specified.";
9696
return xls::ExitStatus(xls::dslx::RealMain(
9797
args[0], absl::GetFlag(FLAGS_dslx_stdlib_path), output_header_path,

‎xls/dslx/interpreter_main.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ int main(int argc, char* argv[]) {
237237
absl::StatusOr<xls::FormatPreference> flag_preference =
238238
xls::FormatPreferenceFromString(absl::GetFlag(FLAGS_format_preference));
239239
// `default` is not a legal overriding format preference.
240-
XLS_QCHECK(flag_preference.ok() &&
241-
absl::GetFlag(FLAGS_format_preference) != "default")
240+
QCHECK(flag_preference.ok() &&
241+
absl::GetFlag(FLAGS_format_preference) != "default")
242242
<< "-format_preference accepts binary|hex|decimal";
243243
preference = flag_preference.value();
244244
}

‎xls/dslx/ir_convert/ir_converter_main.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ absl::Status RealMain(absl::Span<const std::string_view> paths,
102102
// The following checks are performed inside ConvertFilesToPackage(), but we
103103
// reproduce them here to give nicer error messages.
104104
if (!package_name.has_value()) {
105-
XLS_QCHECK_EQ(paths.size(), 1)
105+
QCHECK_EQ(paths.size(), 1)
106106
<< "-package_name *must* be given when multiple input paths are "
107107
"supplied";
108108
}
109109
if (paths.size() > 1) {
110-
XLS_QCHECK(!top.has_value())
110+
QCHECK(!top.has_value())
111111
<< "-entry cannot be supplied with multiple input paths (need a single "
112112
"input path to know where to resolve the entry function)";
113113
}

‎xls/dslx/type_system/BUILD

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,13 +616,16 @@ cc_binary(
616616
deps = [
617617
":type_info_to_proto",
618618
"@com_google_absl//absl/flags:flag",
619+
"@com_google_absl//absl/log:check",
619620
"@com_google_absl//absl/status",
620621
"@com_google_absl//absl/status:statusor",
621622
"@com_google_absl//absl/strings",
622623
"@com_google_absl//absl/types:span",
623624
"//xls/common:exit_status",
624625
"//xls/common:init_xls",
625626
"//xls/common/file:filesystem",
627+
"//xls/common/logging",
628+
"//xls/common/status:status_macros",
626629
"//xls/dslx:command_line_utils",
627630
"//xls/dslx:create_import_data",
628631
"//xls/dslx:default_dslx_stdlib_path",

0 commit comments

Comments
 (0)