Skip to content

Commit 7ece6f2

Browse files
lukaszgotszaldintelsys_zuul
lukaszgotszaldintel
authored and
sys_zuul
committed
replace "llvm_unreachable" in IGC/Compiler by IGC_ASSERT_EXIT
Change-Id: I9071568d7f3cd318d82d864bc3ddd2071766af86
1 parent fbb866a commit 7ece6f2

35 files changed

+146
-162
lines changed

‎IGC/Compiler/DebugInfo/DIE.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4848
#include "llvm/MC/MCExpr.h"
4949
#include "llvm/Support/Allocator.h"
5050
#include "llvm/Support/Debug.h"
51-
#include "llvm/Support/ErrorHandling.h"
5251
#include "llvm/Support/Format.h"
5352
#include "llvm/Support/FormattedStream.h"
5453
#include "llvm/Support/LEB128.h"
@@ -283,7 +282,7 @@ void DIEInteger::EmitValue(StreamEmitter* Asm, dwarf::Form Form) const
283282
case dwarf::DW_FORM_sdata: Asm->EmitSLEB128(Integer); return;
284283
case dwarf::DW_FORM_addr:
285284
Size = Asm->GetPointerSize(); break;
286-
default: llvm_unreachable("DIE Value form not supported yet");
285+
default: IGC_ASSERT_EXIT_MESSAGE(0, "DIE Value form not supported yet");
287286
}
288287
Asm->EmitIntValue(Integer, Size);
289288
}
@@ -310,7 +309,7 @@ unsigned DIEInteger::SizeOf(StreamEmitter* AP, dwarf::Form Form) const
310309
case dwarf::DW_FORM_udata: return getULEB128Size(Integer);
311310
case dwarf::DW_FORM_sdata: return getSLEB128Size(Integer);
312311
case dwarf::DW_FORM_addr: return AP->GetPointerSize();
313-
default: llvm_unreachable("DIE Value form not supported yet");
312+
default: IGC_ASSERT_EXIT_MESSAGE(0, "DIE Value form not supported yet");
314313
}
315314
}
316315

@@ -514,7 +513,7 @@ void DIEBlock::EmitValue(StreamEmitter* Asm, dwarf::Form Form) const
514513
{
515514
switch (Form)
516515
{
517-
default: llvm_unreachable("Improper form for block");
516+
default: IGC_ASSERT_EXIT_MESSAGE(0, "Improper form for block");
518517
case dwarf::DW_FORM_block1: Asm->EmitInt8(Size); break;
519518
case dwarf::DW_FORM_block2: Asm->EmitInt16(Size); break;
520519
case dwarf::DW_FORM_block4: Asm->EmitInt32(Size); break;
@@ -536,7 +535,7 @@ unsigned DIEBlock::SizeOf(StreamEmitter* /*AP*/, dwarf::Form Form) const
536535
case dwarf::DW_FORM_block2: return Size + sizeof(int16_t);
537536
case dwarf::DW_FORM_block4: return Size + sizeof(int32_t);
538537
case dwarf::DW_FORM_block: return Size + getULEB128Size(Size);
539-
default: llvm_unreachable("Improper form for block");
538+
default: IGC_ASSERT_EXIT_MESSAGE(0, "Improper form for block");
540539
}
541540
}
542541

‎IGC/Compiler/DebugInfo/DwarfDebug.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6060
#include "llvm/MC/MCStreamer.h"
6161
#include "llvm/MC/MCSymbol.h"
6262
#include "llvm/Support/Debug.h"
63-
#include "llvm/Support/ErrorHandling.h"
6463
#include "llvm/Support/FormattedStream.h"
6564
#include "llvm/Support/LEB128.h"
6665
#include "llvm/IR/IntrinsicInst.h"
@@ -2002,7 +2001,7 @@ void DwarfDebug::recordSourceLine(
20022001
}
20032002
else
20042003
{
2005-
llvm_unreachable("Unexpected scope info");
2004+
IGC_ASSERT_EXIT_MESSAGE(0, "Unexpected scope info");
20062005
}
20072006

20082007
Src = getOrCreateSourceID(Fn, Dir, Asm->GetDwarfCompileUnitID());

‎IGC/Compiler/DebugInfo/LexicalScopes.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4545
#include "llvm/IR/Function.h"
4646
#include "llvm/IR/Metadata.h"
4747
#include "llvm/Support/Debug.h"
48-
#include "llvm/Support/ErrorHandling.h"
4948
#include "llvm/Support/FormattedStream.h"
5049
#include "llvm/IR/Module.h"
5150
#include "common/LLVMWarningsPop.hpp"

‎IGC/Compiler/DebugInfo/StreamEmitter.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ namespace IGC
131131
{
132132
switch ((unsigned)fixup.getKind())
133133
{
134-
default: llvm_unreachable("invalid fixup kind!");
134+
default: IGC_ASSERT_EXIT_MESSAGE(0, "invalid fixup kind!");
135135

136136
case FK_Data_8: type = ELF::R_X86_64_PC64; break;
137137
case FK_Data_4: type = ELF::R_X86_64_PC32; break;
@@ -145,7 +145,7 @@ namespace IGC
145145
switch (modifier)
146146
{
147147
default:
148-
llvm_unreachable("Unimplemented");
148+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
149149
case MCSymbolRefExpr::VK_None:
150150
type = ELF::R_X86_64_PC32;
151151
break;
@@ -180,12 +180,12 @@ namespace IGC
180180
{
181181
switch ((unsigned)fixup.getKind())
182182
{
183-
default: llvm_unreachable("invalid fixup kind!");
183+
default: IGC_ASSERT_EXIT_MESSAGE(0, "invalid fixup kind!");
184184
case FK_Data_8:
185185
switch (modifier)
186186
{
187187
default:
188-
llvm_unreachable("Unimplemented");
188+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
189189
case MCSymbolRefExpr::VK_None:
190190
type = ELF::R_X86_64_64;
191191
break;
@@ -218,14 +218,14 @@ namespace IGC
218218
{
219219
switch ((unsigned)fixup.getKind())
220220
{
221-
default: llvm_unreachable("invalid fixup kind!");
221+
default: IGC_ASSERT_EXIT_MESSAGE(0, "invalid fixup kind!");
222222

223223
case FK_PCRel_4:
224224
case FK_Data_4:
225225
switch (modifier)
226226
{
227227
default:
228-
llvm_unreachable("Unimplemented");
228+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
229229
case MCSymbolRefExpr::VK_None:
230230
type = ELF::R_386_PC32;
231231
break;
@@ -240,14 +240,14 @@ namespace IGC
240240
{
241241
switch ((unsigned)fixup.getKind())
242242
{
243-
default: llvm_unreachable("invalid fixup kind!");
243+
default: IGC_ASSERT_EXIT_MESSAGE(0, "invalid fixup kind!");
244244

245245
case FK_PCRel_4:
246246
case FK_Data_4:
247247
switch (modifier)
248248
{
249249
default:
250-
llvm_unreachable("Unimplemented");
250+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
251251
case MCSymbolRefExpr::VK_None:
252252
type = ELF::R_386_32;
253253
break;
@@ -290,7 +290,7 @@ namespace IGC
290290
}
291291
}
292292
else
293-
llvm_unreachable("Unsupported ELF machine type.");
293+
IGC_ASSERT_EXIT_MESSAGE(0, "Unsupported ELF machine type.");
294294

295295
return type;
296296
}
@@ -314,7 +314,7 @@ namespace IGC
314314
{
315315
switch (Kind)
316316
{
317-
default: llvm_unreachable("invalid fixup kind!");
317+
default: IGC_ASSERT_EXIT_MESSAGE(0, "invalid fixup kind!");
318318
case FK_PCRel_1:
319319
case FK_SecRel_1:
320320
case FK_Data_1: return 0;
@@ -382,7 +382,7 @@ namespace IGC
382382
#endif
383383
{
384384
IGC_ASSERT(false && "TODO: implement this");
385-
llvm_unreachable("Unimplemented");
385+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
386386
return false;
387387
}
388388

@@ -392,15 +392,15 @@ namespace IGC
392392
const MCAsmLayout& layout) const override
393393
{
394394
IGC_ASSERT(false && "TODO: implement this");
395-
llvm_unreachable("Unimplemented");
395+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
396396
return false;
397397
}
398398

399399
void relaxInstruction(const MCInst& inst, const MCSubtargetInfo& STI,
400400
MCInst& res) const override
401401
{
402402
IGC_ASSERT(false && "TODO: implement this");
403-
llvm_unreachable("Unimplemented");
403+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
404404
}
405405

406406
#if LLVM_VERSION_MAJOR == 4
@@ -455,7 +455,7 @@ namespace IGC
455455
std::unique_ptr<MCObjectTargetWriter> createObjectTargetWriter() const override
456456
{
457457
IGC_ASSERT(false && "TODO: implement this");
458-
llvm_unreachable("Unimplemented");
458+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
459459
}
460460
#endif
461461
};
@@ -468,13 +468,13 @@ namespace IGC
468468
const MCSubtargetInfo& m) const
469469
{
470470
IGC_ASSERT(false && "TODO: implement this");
471-
llvm_unreachable("Unimplemented");
471+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
472472
}
473473

474474
void operator=(const VISAMCCodeEmitter&)
475475
{
476476
IGC_ASSERT(false && "TODO: implement this");
477-
llvm_unreachable("Unimplemented");
477+
IGC_ASSERT_EXIT_MESSAGE(0, "Unimplemented");
478478
}
479479

480480
};

‎IGC/Compiler/Legalizer/InstElementizer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
#include "TypeLegalizer.h"
3131
#include "InstElementizer.h"
3232
#include "common/LLVMWarningsPush.hpp"
33-
#include "llvm/Support/Debug.h"
3433
#include "llvm/Support/raw_ostream.h"
3534
#include "common/LLVMWarningsPop.hpp"
35+
#include "Probe/Assertion.h"
3636

3737
using namespace llvm;
3838
using namespace IGC::Legalizer;
3939

4040
bool InstElementizer::elementize(Instruction* I) {
41-
llvm_unreachable("NOT IMPLEMENTED YET!");
41+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
4242
return false;
4343
}

‎IGC/Compiler/Legalizer/InstExpander.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ bool InstExpander::expand(Instruction* I) {
5353
// By default, capture all missing instructions!
5454
bool InstExpander::visitInstruction(Instruction& I) {
5555
LLVM_DEBUG(dbgs() << "EXPAND: " << I << '\n');
56-
llvm_unreachable("UNKNOWN INSTRUCTION IS BEING EXPANDED!");
56+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN INSTRUCTION IS BEING EXPANDED!");
5757
return false;
5858
}
5959

@@ -89,43 +89,43 @@ bool InstExpander::visitTerminatorInst(IGCLLVM::TerminatorInst& I) {
8989
//
9090
bool InstExpander::visitAdd(BinaryOperator& I) {
9191
// FIXME:
92-
llvm_unreachable("NOT IMPLEMENTED YET!");
92+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
9393
return false;
9494
}
9595

9696
bool InstExpander::visitSub(BinaryOperator& I) {
9797
// FIXME:
98-
llvm_unreachable("NOT IMPLEMENTED YET!");
98+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
9999
return false;
100100
}
101101

102102
bool InstExpander::visitMul(BinaryOperator& I) {
103103
// FIXME:
104-
llvm_unreachable("NOT IMPLEMENTED YET!");
104+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
105105
return false;
106106
}
107107

108108
bool InstExpander::visitUDiv(BinaryOperator& I) {
109109
// FIXME:
110-
llvm_unreachable("NOT IMPLEMENTED YET!");
110+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
111111
return false;
112112
}
113113

114114
bool InstExpander::visitSDiv(BinaryOperator& I) {
115115
// FIXME:
116-
llvm_unreachable("NOT IMPLEMENTED YET!");
116+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
117117
return false;
118118
}
119119

120120
bool InstExpander::visitURem(BinaryOperator& I) {
121121
// FIXME:
122-
llvm_unreachable("NOT IMPLEMENTED YET!");
122+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
123123
return false;
124124
}
125125

126126
bool InstExpander::visitSRem(BinaryOperator& I) {
127127
// FIXME:
128-
llvm_unreachable("NOT IMPLEMENTED YET!");
128+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
129129
return false;
130130
}
131131

@@ -358,7 +358,7 @@ bool InstExpander::visitLShr(BinaryOperator& I) {
358358

359359
bool InstExpander::visitAShr(BinaryOperator& I) {
360360
// FIXME:
361-
llvm_unreachable("NOT IMPLEMENTED YET!");
361+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
362362
return false;
363363
}
364364

@@ -388,7 +388,7 @@ bool InstExpander::visitBinaryOperator(BinaryOperator& I) {
388388
break;
389389
}
390390
default:
391-
llvm_unreachable("UNKNOWN BINARY OPERATOR IS BEING EXPANDED!");
391+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN BINARY OPERATOR IS BEING EXPANDED!");
392392
}
393393
return true;
394394
}

‎IGC/Compiler/Legalizer/InstLegalChecker.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3030
#include "TypeLegalizer.h"
3131
#include "InstLegalChecker.h"
3232
#include "common/LLVMWarningsPush.hpp"
33-
3433
#include "llvmWrapper/Support/Debug.h"
35-
3634
#include "llvm/Support/raw_ostream.h"
3735
#include "common/LLVMWarningsPop.hpp"
36+
#include "Probe/Assertion.h"
37+
3838
using namespace llvm;
3939
using namespace IGC::Legalizer;
4040

4141
// By default, capture all missing instructions!
4242
LegalizeAction InstLegalChecker::visitInstruction(Instruction& I) {
4343
LLVM_DEBUG(dbgs() << "LEGAL-CHECK: " << I << '\n');
44-
llvm_unreachable("UNKNOWN INSTRUCTION IS BEING LEGAL-CHECKED!");
44+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN INSTRUCTION IS BEING LEGAL-CHECKED!");
4545
}
4646

4747
/// Terminator instructions

‎IGC/Compiler/Legalizer/InstPromoter.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ bool InstPromoter::promote(Instruction* I) {
6363
// By default, capture all missing instructions!
6464
bool InstPromoter::visitInstruction(Instruction& I) {
6565
LLVM_DEBUG(dbgs() << "PROMOTE: " << I << '\n');
66-
llvm_unreachable("UNKNOWN INSTRUCTION IS BEING PROMOTED!");
66+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN INSTRUCTION IS BEING PROMOTED!");
6767
return false;
6868
}
6969

@@ -180,7 +180,7 @@ bool InstPromoter::visitBinaryOperator(BinaryOperator& I) {
180180
RHS = TL->zext(RHS, I.getType());
181181
break;
182182
default:
183-
llvm_unreachable("UNKNOWN BINARY OPERATOR IS BEING PROMOTED!");
183+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN BINARY OPERATOR IS BEING PROMOTED!");
184184
}
185185

186186
Promoted =
@@ -418,13 +418,13 @@ bool InstPromoter::visitBitCastInst(BitCastInst& I) {
418418
/// Other operators
419419

420420
bool InstPromoter::visitGenIntrinsicInst(GenIntrinsicInst& I) {
421-
llvm_unreachable("UNKNOWN GEN INSTRINSIC INSTRUCTION IS BEING PROMOTED!");
421+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN GEN INSTRINSIC INSTRUCTION IS BEING PROMOTED!");
422422
return false;
423423
}
424424

425425
bool InstPromoter::visitCallInst(CallInst& I) {
426426
if (isa<GenIntrinsicInst>(&I))
427427
return visitGenIntrinsicInst(static_cast<GenIntrinsicInst&>(I));
428-
llvm_unreachable("NOT IMPLEMENTED YET!");
428+
IGC_ASSERT_EXIT_MESSAGE(0, "NOT IMPLEMENTED YET!");
429429
return false;
430430
}

‎IGC/Compiler/Legalizer/InstScalarizer.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ bool InstScalarizer::scalarize(Instruction* I) {
5454
// By default, capture all missing instructions!
5555
bool InstScalarizer::visitInstruction(Instruction& I) {
5656
LLVM_DEBUG(dbgs() << "SCALARIZE: " << I << '\n');
57-
llvm_unreachable("UNKNOWN INSTRUCTION IS BEING SCALARIZED!");
57+
IGC_ASSERT_EXIT_MESSAGE(0, "UNKNOWN INSTRUCTION IS BEING SCALARIZED!");
5858
return false;
5959
}
6060

@@ -428,8 +428,7 @@ bool InstScalarizer::visitExtractElementInst(ExtractElementInst& I) {
428428
// %elt = load eT* %eptr
429429
//
430430
// It would be much more complicated if eT is not byte addressable.
431-
llvm_unreachable(
432-
"NON-CONSTANT IDX IN EXTRACT-ELEMENT IS NOT SUPPORTED YET!");
431+
IGC_ASSERT_EXIT_MESSAGE(0, "NON-CONSTANT IDX IN EXTRACT-ELEMENT IS NOT SUPPORTED YET!");
433432
}
434433

435434
ConstantInt* CI = cast<ConstantInt>(I.getIndexOperand());
@@ -474,8 +473,7 @@ bool InstScalarizer::visitInsertElementInst(InsertElementInst& I) {
474473
// %vec1 = load <N x eT>* %stk
475474
//
476475
// It would be much more complicated if eT is not byte addressable.
477-
llvm_unreachable(
478-
"NON-CONSTANT IDX IN INSERT-ELEMENT IS NOT SUPPORTED YET!");
476+
IGC_ASSERT_EXIT_MESSAGE(0, "NON-CONSTANT IDX IN INSERT-ELEMENT IS NOT SUPPORTED YET!");
479477
}
480478

481479
ConstantInt* CI = cast<ConstantInt>(I.getOperand(2));

0 commit comments

Comments
 (0)