@@ -17,8 +17,8 @@ use crate::{
1717 ZKVMWitnesses ,
1818 } ,
1919 tables:: {
20- MemFinalRecord , MemInitRecord , ProgramTableCircuit , ProgramTableConfig , ShardRamCircuit ,
21- TableCircuit ,
20+ MemFinalRecord , MemInitRecord , ProgramTableCircuit , ProgramTableConfig ,
21+ ShardRamEcTreeCircuit , TableCircuit ,
2222 } ,
2323} ;
2424use ceno_emul:: {
@@ -27,8 +27,6 @@ use ceno_emul::{
2727 StepCellExtractor , StepIndex , StepRecord , SyscallWitness , Tracer , VM_REG_COUNT , VMState ,
2828 WORD_SIZE , Word , WordAddr , host_utils:: read_all_messages,
2929} ;
30- #[ cfg( feature = "gpu" ) ]
31- use ceno_gpu:: CudaHal ;
3230use clap:: ValueEnum ;
3331use either:: Either ;
3432use ff_ext:: { ExtensionField , SmallField } ;
@@ -1692,20 +1690,21 @@ pub fn generate_witness<'a, E: ExtensionField>(
16921690 )
16931691 } ) . unwrap ( ) ;
16941692
1695- if let Some ( shard_ram_witnesses ) =
1696- zkvm_witness. get_witness ( & ShardRamCircuit :: < E > :: name ( ) )
1693+ if let Some ( shard_ram_ec_tree_witnesses ) =
1694+ zkvm_witness. get_witness ( & ShardRamEcTreeCircuit :: < E > :: name ( ) )
16971695 {
16981696 info_span ! ( "shard_ram_ec_sum" ) . in_scope ( || {
1699- let shard_ram_ec_sum: SepticPoint < E :: BaseField > = shard_ram_witnesses
1700- . iter ( )
1701- . filter ( |shard_ram_witness| shard_ram_witness. num_instances [ 0 ] > 0 )
1702- . map ( |shard_ram_witness| {
1703- ShardRamCircuit :: < E > :: extract_ec_sum (
1704- & system_config. mmu_config . ram_bus_circuit ,
1705- & shard_ram_witness. witness_rmms [ 0 ] ,
1706- )
1707- } )
1708- . sum ( ) ;
1697+ let shard_ram_ec_sum: SepticPoint < E :: BaseField > =
1698+ shard_ram_ec_tree_witnesses
1699+ . iter ( )
1700+ . filter ( |shard_ram_witness| shard_ram_witness. num_instances [ 0 ] > 0 )
1701+ . map ( |shard_ram_witness| {
1702+ ShardRamEcTreeCircuit :: < E > :: extract_ec_sum (
1703+ & system_config. mmu_config . ram_bus_ec_tree_circuit ,
1704+ & shard_ram_witness. witness_rmms [ 0 ] ,
1705+ )
1706+ } )
1707+ . sum ( ) ;
17091708
17101709 let xy = shard_ram_ec_sum
17111710 . x
0 commit comments