Adapt Dr.Jit to Dr.Jit-Core code generation

This PR makes Dr.Jit compatible with the following Dr.Jit-Core PRs: - mitsuba-renderer/drjit-core#40 - mitsuba-renderer/drjit-core#41
mitsuba-renderer · Nov 30, 2022 · 1af8233 · 1af8233
1 parent d5f4e65
commit 1af8233
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/ext/drjit-core b/ext/drjit-core
diff --git a/include/drjit/loop.h b/include/drjit/loop.h
@@ -172,9 +172,6 @@ struct Loop<Mask, enable_if_jit_array_t<Mask>> {
         if (!m_record)
             return;
 
-        // Capture JIT state and begin recording session
-        m_jit_state.new_scope();
-
         // Rewrite loop state variables (1)
         m_loop_init = jit_var_loop_init(m_indices.size(), m_indices.data());
 
@@ -299,7 +296,6 @@ struct Loop<Mask, enable_if_jit_array_t<Mask>> {
                     m_indices_prev.clear();
 
                     m_jit_state.end_recording();
-                    m_jit_state.clear_scope();
                     m_jit_state.clear_mask_if_set();
                     jit_var_mark_side_effect(rv);
 

diff --git a/include/drjit/vcall_jit_record.h b/include/drjit/vcall_jit_record.h
@@ -96,7 +96,6 @@ Result vcall_jit_record_impl(const char *name, uint32_t n_inst,
 
     detail::JitState<Backend> jit_state;
     jit_state.begin_recording();
-    jit_state.new_scope();
 
     state[0] = jit_record_checkpoint(Backend);
 
@@ -156,6 +155,7 @@ Result vcall_jit_record_impl(const char *name, uint32_t n_inst,
 
     jit_state.end_recording();
     jit_var_mark_side_effect(se);
+    jit_new_scope(Backend);
 
     if constexpr (!std::is_same_v<Result, std::nullptr_t>) {
         Result result;
@@ -236,6 +236,7 @@ Result vcall_jit_record(const char *name, const Func &func, Self &self,
             std::make_index_sequence<sizeof...(Args)>(), args...);
     } else {
         isolate_grad<DiffType> guard;
+        jit_new_scope(Backend);
 
         return vcall_jit_record_impl<Result, Base>(
             name, n_inst, func, self, mask,
+3 −18		include/drjit-core/state.h
+4 −12		src/api.cpp
+2 −1		src/cuda_api.cpp
+63 −35		src/eval.cpp
+47 −21		src/eval.h
+34 −44		src/eval_cuda.cpp
+33 −60		src/eval_llvm.cpp
+7 −0		src/hash.h
+17 −15		src/llvm_api.cpp
+19 −2		src/loop.cpp
+9 −14		src/op.cpp
+15 −10		src/optix_api.cpp
+19 −28		src/printf.cpp
+19 −10		src/var.cpp
+3 −0		src/var.h
+105 −114		src/vcall.cpp
+2 −0		src/vcall.h
+1 −5		tests/ekloop.h
+21 −10		tests/vcall.cpp