Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/Dialect/RTG/Transforms/EmbedValidationValuesPass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ LogicalResult EmbedValidationValuesPass::parseFile(
<< "cannot parse value of type " << op.getValue().getType()
<< " from string '" << value << "'";

if (!valueMap.insert({idAttr, valueAttr}).second)
return emitError(idLoc) << "duplicate ID in input file: " << idAttr;
if (!valueMap.insert({idAttr, valueAttr}).second) {
if (valueMap[idAttr] != valueAttr)
return emitError(idLoc) << "duplicate ID in input file: " << idAttr;
}

LLVM_DEBUG(llvm::dbgs() << "- Parsed value for " << idAttr << "\n");
}
Expand Down
14 changes: 14 additions & 0 deletions test/Dialect/RTG/Transform/embed-validation-values.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,17 @@ rtg.test @embed_value() {
rtgtest.rv32i.lui %0, %6#1 : !rtg.isa.immediate<32>
rtgtest.rv32i.lui %0, %6#2 : !rtg.isa.immediate<32>
}

//--- test7.mlir
// RUN: circt-opt %t/test7.mlir --rtg-embed-validation-values=filename=%S/validation-values-3.txt | FileCheck %s --check-prefix=CHECK-TEST7

// CHECK-TEST7-LABEL: rtg.test @embed_value
rtg.test @embed_value() {
// CHECK-TEST7-NEXT: [[REG:%.+]] = rtg.fixed_reg #rtgtest.t0
// CHECK-TEST7-NEXT: [[IMM:%.+]] = rtg.constant #rtg.isa.immediate<32, 4096>
// CHECK-TEST7-NEXT: rtgtest.rv32i.lui [[REG]], [[IMM]] : !rtg.isa.immediate<32>
%reg = rtg.fixed_reg #rtgtest.t0
%imm = rtg.constant #rtg.isa.immediate<32, 0x1000>
%exp_val = rtg.validate %reg, %imm, "id1" : !rtgtest.ireg -> !rtg.isa.immediate<32>
rtgtest.rv32i.lui %reg, %exp_val : !rtg.isa.immediate<32>
}
2 changes: 2 additions & 0 deletions test/Dialect/RTG/Transform/validation-values-3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
id1=0x1000
id1=0x1000