Skip to content

Commit efa389f

Browse files
johnfeajohnfea
committed
Add new testminimal and closure-string test.
Signed-off-by: Tuomas Tonteri <[email protected]>
1 parent 0d122e7 commit efa389f

33 files changed

+1346
-613
lines changed

‎CMakeLists.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ else ()
9595
endif ()
9696
set (OSL_LIBNAME_SUFFIX "" CACHE STRING
9797
"Optional name appended to ${PROJECT_NAME} libraries that are built")
98-
option (OSL_BUILD_TESTS "Build the unit tests, testshade, testrender" ON)
98+
option (OSL_BUILD_TESTS "Build the unit tests, testminimal, testshade, testrender" ON)
9999
if (WIN32)
100100
option (USE_LLVM_BITCODE "Generate embedded LLVM bitcode" OFF)
101101
else ()
@@ -113,10 +113,14 @@ set (OSL_SHADER_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/shade
113113
set (OSL_PTX_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/ptx"
114114
CACHE STRING "Directory where OptiX PTX files will be installed")
115115
set (CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library naming postfix for Debug builds (e.g., '_debug')")
116-
option (OSL_USTRINGREP_IS_HASH "Always use ustringhash for strings" OFF)
116+
option (OSL_USTRINGREP_IS_HASH "Always use ustringhash for strings" ON)
117117

118118

119119
set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
120+
121+
if (OSL_USTRINGREP_IS_HASH)
122+
add_definitions ("-DOSL_USTRINGREP_IS_HASH=1")
123+
endif ()
120124
if (OSL_NO_DEFAULT_TEXTURESYSTEM)
121125
add_definitions ("-DOSL_NO_DEFAULT_TEXTURESYSTEM=1")
122126
endif ()
@@ -220,6 +224,7 @@ add_subdirectory (src/oslc)
220224
add_subdirectory (src/oslinfo)
221225

222226
if (OSL_BUILD_TESTS AND BUILD_TESTING)
227+
add_subdirectory (src/testminimal)
223228
add_subdirectory (src/testshade)
224229
add_subdirectory (src/testrender)
225230
endif ()

‎src/cmake/testing.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ macro (osl_add_all_tests)
270270
bug-array-heapoffsets bug-locallifetime bug-outputinit
271271
bug-param-duplicate bug-peep bug-return
272272
calculatenormal-reg
273-
cellnoise closure closure-array closure-layered closure-parameters closure-zero closure-conditional
273+
cellnoise closure closure-array closure-layered closure-parameters closure-string closure-zero closure-conditional
274274
color color-reg colorspace comparison
275275
complement-reg compile-buffer compassign-bool compassign-reg
276276
component-range

‎src/include/OSL/llvm_util.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ class OSLEXECPUBLIC LLVM_Util {
718718
/// Return an llvm::Value holding the given string constant (as
719719
/// determined by the ustring_rep).
720720
llvm::Value* constant(ustring s);
721+
llvm::Value* constant_real_ustring(ustring s);
721722
llvm::Value* constant(string_view s) { return constant(ustring(s)); }
722723

723724
llvm::Constant* constant_array(cspan<llvm::Constant*> constants);
@@ -750,6 +751,7 @@ class OSLEXECPUBLIC LLVM_Util {
750751
llvm::Constant* wide_constant(size_t i);
751752
llvm::Constant* wide_constant_bool(bool b);
752753
llvm::Value* wide_constant(ustring s);
754+
llvm::Value* wide_constant_real_ustring(ustring s);
753755
llvm::Value* wide_constant(string_view s)
754756
{
755757
return wide_constant(ustring(s));
@@ -1058,10 +1060,14 @@ class OSLEXECPUBLIC LLVM_Util {
10581060
IRBuilder& builder();
10591061

10601062
int m_debug;
1061-
bool m_dumpasm = false;
1062-
bool m_jit_fma = false;
1063-
bool m_jit_aggressive = false;
1063+
bool m_dumpasm = false;
1064+
bool m_jit_fma = false;
1065+
bool m_jit_aggressive = false;
1066+
#ifndef OSL_USTRINGREP_IS_HASH
10641067
UstringRep m_ustring_rep = UstringRep::charptr;
1068+
#else
1069+
UstringRep m_ustring_rep = UstringRep::hash;
1070+
#endif
10651071
PerThreadInfo::Impl* m_thread;
10661072
llvm::LLVMContext* m_llvm_context;
10671073
llvm::Module* m_llvm_module;

‎src/liboslexec/batched_backendllvm.cpp

+29-6
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ BatchedBackendLLVM::BatchedBackendLLVM(ShadingSystemImpl& shadingsys,
143143
case 8: m_true_mask_value = Mask<8>(true).value(); break;
144144
default: OSL_ASSERT(0 && "unsupported vector width");
145145
}
146+
147+
// Select the appropriate ustring representation
148+
ll.ustring_rep(LLVM_Util::UstringRep::hash);
149+
146150
ll.dumpasm(shadingsys.m_llvm_dumpasm);
147151
ll.jit_fma(shadingsys.m_llvm_jit_fma);
148152
ll.jit_aggressive(shadingsys.m_llvm_jit_aggressive);
@@ -191,7 +195,7 @@ BatchedBackendLLVM::llvm_pass_type(const TypeSpec& typespec)
191195
else if (t == TypeDesc::INT)
192196
lt = ll.type_int();
193197
else if (t == TypeDesc::STRING)
194-
lt = (llvm::Type*)ll.type_ustring();
198+
lt = (llvm::Type*)ll.type_real_ustring();
195199
else if (t.aggregate == TypeDesc::VEC3)
196200
lt = (llvm::Type*)ll.type_void_ptr(); //llvm_type_triple_ptr();
197201
else if (t.aggregate == TypeDesc::MATRIX44)
@@ -667,10 +671,11 @@ BatchedBackendLLVM::llvm_get_pointer(const Symbol& sym, int deriv,
667671
#endif
668672

669673
int d = deriv * std::max(1, t.arraylen);
670-
if (arrayindex)
674+
if (arrayindex) {
671675
arrayindex = ll.op_add(arrayindex, ll.constant(d));
672-
else
676+
} else {
673677
arrayindex = ll.constant(d);
678+
}
674679

675680
llvm::Type* result_type = llvm_type(t.elementtype());
676681
if (!sym.is_uniform()) {
@@ -715,7 +720,8 @@ llvm::Value*
715720
BatchedBackendLLVM::llvm_load_value(const Symbol& sym, int deriv,
716721
llvm::Value* arrayindex, int component,
717722
TypeDesc cast, bool op_is_uniform,
718-
bool index_is_uniform)
723+
bool index_is_uniform,
724+
bool always_real_ustring)
719725
{
720726
// A uniform symbol can be broadcast into a varying value.
721727
// But a varying symbol can NOT be loaded into a uniform value.
@@ -780,9 +786,15 @@ BatchedBackendLLVM::llvm_load_value(const Symbol& sym, int deriv,
780786
if (sym.typespec().is_string()) {
781787
ustring string_val = sym.get_string();
782788
if (op_is_uniform) {
783-
return ll.constant(string_val);
789+
if (!always_real_ustring)
790+
return ll.constant(string_val);
791+
else
792+
return ll.constant_real_ustring(string_val);
784793
} else {
785-
return ll.wide_constant(string_val);
794+
if (!always_real_ustring)
795+
return ll.wide_constant(string_val);
796+
else
797+
return ll.wide_constant_real_ustring(string_val);
786798
}
787799
}
788800
OSL_ASSERT(0 && "unhandled constant type");
@@ -796,7 +808,17 @@ BatchedBackendLLVM::llvm_load_value(const Symbol& sym, int deriv,
796808
sym.forced_llvm_bool());
797809
}
798810

811+
llvm::Value*
812+
BatchedBackendLLVM::llvm_const_hash(string_view str)
813+
{
814+
return llvm_const_hash(ustring(str));
815+
}
799816

817+
llvm::Value*
818+
BatchedBackendLLVM::llvm_const_hash(ustring str)
819+
{
820+
return ll.constant64((uint64_t)str.hash());
821+
}
800822

801823
llvm::Value*
802824
BatchedBackendLLVM::llvm_load_mask(const Symbol& cond)
@@ -1717,6 +1739,7 @@ BatchedBackendLLVM::llvm_call_function(const FuncSpec& name,
17171739
= llvm_load_value(s, /*deriv=*/d,
17181740
/*component*/ c, TypeUnknown,
17191741
function_is_uniform);
1742+
17201743
// Store our wide pointer on the stack
17211744
llvm_store_value(wide_value, tmpptr, t, d, NULL, c,
17221745
/*dst_is_uniform*/ false);

‎src/liboslexec/batched_backendllvm.h

+7-3
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,14 @@ class BatchedBackendLLVM : public OSOProcessorBase {
9898
/// performed if cast is the default of UNKNOWN).
9999
llvm::Value* llvm_load_value(const Symbol& sym, int deriv,
100100
llvm::Value* arrayindex, int component,
101-
TypeDesc cast = TypeDesc::UNKNOWN,
102-
bool op_is_uniform = true,
103-
bool index_is_uniform = true);
101+
TypeDesc cast = TypeDesc::UNKNOWN,
102+
bool op_is_uniform = true,
103+
bool index_is_uniform = true,
104+
bool always_real_ustring = false);
104105

106+
llvm::Value* llvm_const_hash(string_view str);
107+
108+
llvm::Value* llvm_const_hash(ustring str);
105109

106110
/// Given an llvm::Value* of a pointer (and the type of the data
107111
/// that it points to), Return the llvm::Value* corresponding to the

‎src/liboslexec/batched_llvm_gen.cpp

+12-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#endif
1616

1717
#include "batched_backendllvm.h"
18-
18+
#include <llvm/Support/raw_ostream.h>
1919

2020

2121
using namespace OSL;
@@ -375,6 +375,7 @@ LLVMGEN(llvm_gen_printf)
375375
std::string ourformat(oldfmt, format); // straddle the format
376376
// Doctor it to fix mismatches between format and data
377377
Symbol& sym(*rop.opargsym(op, arg));
378+
378379
OSL_ASSERT(!sym.typespec().is_structure_based());
379380

380381
bool arg_is_uniform = sym.is_uniform();
@@ -416,11 +417,13 @@ LLVMGEN(llvm_gen_printf)
416417
// widened, so our typical op_is_uniform doesn't do what we
417418
// want for this when loading. So just pass arg_is_uniform
418419
// which will avoid widening any uniform arguments.
419-
llvm::Value* loaded
420-
= rop.llvm_load_value(sym, 0, arrind, c,
421-
TypeDesc::UNKNOWN,
422-
/*op_is_uniform*/ arg_is_uniform,
423-
/*index_is_uniform*/ true);
420+
// Always use real ustring here because wide/opstring printf va_args expects
421+
// strings and not hashes
422+
bool always_real_ustring = true;
423+
llvm::Value* loaded = rop.llvm_load_value(
424+
sym, 0, arrind, c, TypeDesc::UNKNOWN,
425+
/*op_is_uniform*/ arg_is_uniform,
426+
/*index_is_uniform*/ true, always_real_ustring);
424427

425428
// Always expand llvm booleans to integers
426429
if (sym.forced_llvm_bool()) {
@@ -482,6 +485,7 @@ LLVMGEN(llvm_gen_printf)
482485
llvm::Value* ret = rop.ll.call_function(rop.build_name(func_spec),
483486
call_args);
484487

488+
485489
// The format op returns a string value, put in in the right spot
486490
if (op.opname() == op_format)
487491
rop.llvm_store_value(ret, *rop.opargsym(op, 0));
@@ -861,6 +865,7 @@ LLVMGEN(llvm_gen_generic)
861865
&& (uniformFormOfFunction || functionIsLlvmInlined)) {
862866
OSL_DEV_ONLY(std::cout << ">>stores return value "
863867
<< rop.build_name(func_spec) << std::endl);
868+
864869
llvm::Value* r = rop.llvm_call_function(
865870
func_spec, &(args[1]), op.nargs() - 1,
866871
/*deriv_ptrs*/ false, uniformFormOfFunction,
@@ -3300,7 +3305,7 @@ LLVMGEN(llvm_gen_construct_triple)
33003305
= { rop.sg_void_ptr(), rop.ll.void_ptr(transform),
33013306
space_is_uniform ? rop.llvm_load_value(Space)
33023307
: rop.llvm_void_ptr(Space),
3303-
rop.ll.constant(Strings::common),
3308+
rop.llvm_const_hash(Strings::common),
33043309
rop.ll.mask_as_int(rop.ll.current_mask()) };
33053310

33063311
// Dynamically build function name

‎src/liboslexec/builtindecl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ DECL(osl_closure_to_string, "sXX")
133133
DECL(osl_closure_to_ustringhash, "hXX")
134134
#endif
135135
DECL(osl_format, "hh*")
136-
DECL(osl_gen_ustringhash_pod, "hs")
136+
DECL(osl_gen_ustringhash_pod, "hh")
137137
DECL(osl_gen_ustring, "sh")
138138
DECL(osl_gen_printfmt, "xXhiXiX")
139139
DECL(osl_gen_filefmt, "xXhhiXiX")

0 commit comments

Comments
 (0)