Skip to content

Commit 7a737f9

Browse files
committed
Replace std::nullopt with empty initializer list:
1 parent 25636fe commit 7a737f9

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

llvm/lib/Target/NVPTX/NVPTXISelDAGToDAG.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,9 +1214,9 @@ bool NVPTXDAGToDAGISel::tryLoadVector(SDNode *N) {
12141214
NVPTX::LDV_f32_v4, NVPTX::LDV_f64_v4);
12151215
break;
12161216
case NVPTXISD::LoadV8:
1217-
Opcode = pickOpcodeForVT(EltVT.getSimpleVT().SimpleTy, std::nullopt,
1218-
std::nullopt, NVPTX::LDV_i32_v8, std::nullopt,
1219-
NVPTX::LDV_f32_v8, std::nullopt);
1217+
Opcode = pickOpcodeForVT(
1218+
EltVT.getSimpleVT().SimpleTy, {/*no i8_v8*/}, {/*no i16_v8*/},
1219+
NVPTX::LDV_i32_v8, {/*no i64_v8*/}, NVPTX::LDV_f32_v8, {/*no f64_v8*/});
12201220
break;
12211221
}
12221222
if (!Opcode)
@@ -1319,13 +1319,13 @@ bool NVPTXDAGToDAGISel::tryLDGLDU(SDNode *N) {
13191319
Opcode = pickOpcodeForVT(
13201320
EltVT.getSimpleVT().SimpleTy, NVPTX::INT_PTX_LDU_G_v4i8_ELE,
13211321
NVPTX::INT_PTX_LDU_G_v4i16_ELE, NVPTX::INT_PTX_LDU_G_v4i32_ELE,
1322-
std::nullopt, NVPTX::INT_PTX_LDU_G_v4f32_ELE, std::nullopt);
1322+
{/*no v4i64*/}, NVPTX::INT_PTX_LDU_G_v4f32_ELE, {/*no v4f64*/});
13231323
break;
13241324
case NVPTXISD::LoadV8:
1325-
Opcode = pickOpcodeForVT(EltVT.getSimpleVT().SimpleTy, std::nullopt,
1326-
std::nullopt, NVPTX::INT_PTX_LDG_G_v8i32_ELE,
1327-
std::nullopt, NVPTX::INT_PTX_LDG_G_v8f32_ELE,
1328-
std::nullopt);
1325+
Opcode = pickOpcodeForVT(
1326+
EltVT.getSimpleVT().SimpleTy, {/*no i8_v8*/}, {/*no i16_v8*/},
1327+
NVPTX::INT_PTX_LDG_G_v8i32_ELE, {/*no i64_v8*/},
1328+
NVPTX::INT_PTX_LDG_G_v8f32_ELE, {/*no f64_v8*/});
13291329
break;
13301330
}
13311331
if (!Opcode)
@@ -1497,9 +1497,9 @@ bool NVPTXDAGToDAGISel::tryStoreVector(SDNode *N) {
14971497
NVPTX::STV_f32_v4, NVPTX::STV_f64_v4);
14981498
break;
14991499
case NVPTXISD::StoreV8:
1500-
Opcode = pickOpcodeForVT(EltVT.getSimpleVT().SimpleTy, std::nullopt,
1501-
std::nullopt, NVPTX::STV_i32_v8, std::nullopt,
1502-
NVPTX::STV_f32_v8, std::nullopt);
1500+
Opcode = pickOpcodeForVT(
1501+
EltVT.getSimpleVT().SimpleTy, {/*no i8_v8*/}, {/*no i16_v8*/},
1502+
NVPTX::STV_i32_v8, {/*no i64_v8*/}, NVPTX::STV_f32_v8, {/*no f64_v8*/});
15031503
break;
15041504
}
15051505

@@ -1559,10 +1559,10 @@ bool NVPTXDAGToDAGISel::tryLoadParam(SDNode *Node) {
15591559
NVPTX::LoadParamMemV2F64);
15601560
break;
15611561
case 4:
1562-
Opcode =
1563-
pickOpcodeForVT(MemVT.getSimpleVT().SimpleTy, NVPTX::LoadParamMemV4I8,
1564-
NVPTX::LoadParamMemV4I16, NVPTX::LoadParamMemV4I32,
1565-
std::nullopt, NVPTX::LoadParamMemV4F32, std::nullopt);
1562+
Opcode = pickOpcodeForVT(MemVT.getSimpleVT().SimpleTy,
1563+
NVPTX::LoadParamMemV4I8, NVPTX::LoadParamMemV4I16,
1564+
NVPTX::LoadParamMemV4I32, {/*no V4I64*/},
1565+
NVPTX::LoadParamMemV4F32, {/*no V4F64*/});
15661566
break;
15671567
}
15681568
if (!Opcode)
@@ -1653,8 +1653,8 @@ bool NVPTXDAGToDAGISel::tryStoreRetval(SDNode *N) {
16531653
case 4:
16541654
Opcode = pickOpcodeForVT(Mem->getMemoryVT().getSimpleVT().SimpleTy,
16551655
NVPTX::StoreRetvalV4I8, NVPTX::StoreRetvalV4I16,
1656-
NVPTX::StoreRetvalV4I32, std::nullopt,
1657-
NVPTX::StoreRetvalV4F32, std::nullopt);
1656+
NVPTX::StoreRetvalV4I32, {/*no V4I64*/},
1657+
NVPTX::StoreRetvalV4F32, {/*no V4F64*/});
16581658
break;
16591659
}
16601660
if (!Opcode)

0 commit comments

Comments
 (0)