summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-04fixed all warningsYong He
2017-11-04fix all unreachable code warningsYong He
2017-11-04Passing both assoctype-simple and assoctype-complex test cases.Yong He
2017-11-04enable -use-ir option when executing compute test cases.Yong He
2017-11-04Natvis file update for improved debugging view of IR constructsYong He
2017-11-04Fix encoding detection when reading text file. Win32 API could mistakenly ↵Yong He
report UTF16 when the file is actually UTF8.
2017-11-04Merge https://github.com/shader-slang/slangYong He
2017-11-04work in-progressYong He
2017-11-03associatedtypes: generating almost correct HLSL, but is not calling ↵Yong He
correctly mangled function.
2017-11-03Fix #248 (#249)Tim Foley
* Fix up test runner output for compute. We want compute-based tests to produce a `.actual` file when compilation fails, so we can easily diagnose the issue. I thought I'd added this capability previous, but it seemst to not be present any more. * Compute result types for constructor decls Fixes #246 When the parser sees an `init()` declaration, it can't easily know what type is is supposed to return, so it leaves the type as NULL. This was causing some downstream crashes. Rather than special-case every site that cares about the result type of a callable, we will instead ensure that we install an actual result type on an initializer/constructor as part of its semantic checking. This code needs to handle both the case where the initializer is declared inside a type, as well as the case where it is declared inside an `extension`.
2017-11-03Merge remote-tracking branch 'refs/remotes/official/master'Yong He
2017-11-03Update natvis file for better viewing of RefPtr, DeclRef and Name classesYong He
2017-11-03in-progress workYong He
2017-11-02work inprogressYONGH\yongh
2017-11-01remove assoctype-complex case to get pass testYONGH\yongh
2017-11-01Adding support for associated types.Yong He
2017-11-01Merge https://github.com/shader-slang/slangYong He
2017-11-01Allow use of dxc compiler for DXIL generation (#241)Tim Foley
- Add shader model 6.0, 6.1, and 6.2 targets - Add DXIL and DXIL assembly as output formats - Add header for DXC API to `external/` - Add `dxc-support.cpp` that wraps usage of the API - Add `-pass-through dxc` option, equivalent to what we have for `fxc` Notes: * This does *not* include any logic to add `dxcompiler.dll` to our build process; that is way out of scope for the build complexity I'm ready to deal with * For right now, the use of `dxcompiler.dll` is hard-coded, and it must be discoverable in the current executable's search path; options to customize can come later * The `-pass-through` option is kind of silly because the code doesn't actually pay attention to the value (just whether it is set). If you set it to `fxc` but ask for DXIL, we pass through `dxc` anyway.
2017-10-31mergeYong He
2017-10-31work in-progress: type checking associated typesYong He
2017-10-31Merge pull request #240 from csyonghe/masterYong He
Fixing issue #236
2017-10-31initiate rebuildYong He
2017-10-31Revert "work in-progress, add parsing for assoc type decls and member type ↵Yong He
expressions" This reverts commit 84f381cc180b3176d6a58da4085ee8470f246922.
2017-10-30work in-progress, add parsing for assoc type decls and member type expressionsYONGH\yongh
2017-10-30Fixing issue #236YONGH\yongh
2017-10-30Merge pull request #235 from tfoleyNV/explicit-this-exprYong He
Support `this` expressions (explicit and implicit)
2017-10-30Merge branch 'master' into explicit-this-exprTim Foley
2017-10-30Fix output for type cast when checking fails (#238)Tim Foley
There were some cases where we would try to emit an `ErrorType` to the output HLSL, which obviously isn't allowed. This change tries to avoid emitting error types, and instead use the original expression when it is available. I tried adding a test case for the change, but I can't convince Slang to output matching line numbers for the error message; it seems like more work is needed on that front.
2017-10-30Allow for implicit `this` expressions.Tim Foley
- When peforming ordinary lookup, if the container declaration for a scope is an aggregate type or `extension` decl, then use a "breadcrumb" to make sure that we use a `this` expression as the base of any resulting declaration reference - Add a test case for implicit `this` usage - Update constrained generic test case to use implicit `this` for member reference, as was originally intended
2017-10-30Support explicit `this` expressionsTim Foley
This is the first step towards supporting traditional object-oriented method definitions; the second step will be to allow `this` expressions to be implicit. - Add a test case using explicit `this`, and expected output - Update parsing logic for expressions so that it handled identifiers similarly to the declaration and statement logic: first try to parse using a syntax declaration looked up in the curent scope, and otherwise fall back to the ordinary `VarExpr` case. * As long as I'm making that change: switch `true` and `false` to be parsed via the callback mechanism rather than be special-cased. * This change will also help out if we ever wanted to add `super`/`base` expressions, `new`, `sizeof`/`alignof` or any other expression keywords. - Add a `ThisExpr` node and register a parser callback for it. - Add semantic checks for `ThisExpr`: basically just look upwards through scopes until we find either an aggregate type declaration or an `extension` declaration, and then use that as the type of the expression. - TODO: eventually we need to guard against a `this` expression inside of a `static` member. - The IR generation logic already handled creation of `this` parameters in function signatures; the missing piece was to register the appropriate parameter in the context, so that we can use it as the lowering of a `this` expression.
2017-10-27Initial work on support code generation for generics with constraints (#233)Tim Foley
This change includes a lot of infrastructure work, but the main point is to allow code like the following: ``` // define an interface interface Helper { float help(); } // define a generic function that uses the interface float test<T : Helper>( T t ) { return t.help(); } // define a type that implements the interface struct A : Helper { float help() { return 1.0 } } // define an ordinary function that calls the // generic function with a concrete type: float doIt() { A a; return test<A>(a); } ``` Getting this to generate valid code involves a lot of steps. This change includes the initial version of all of these steps, but leaves a lot of gaps where more complete implementation is required. The changes include: - Member lookup on types has been centralized, and now handles the case where the type we are looking for a member in is a generic parameter (e.g., given `t.help()` we can now look up `help` in `Helper` by knowing that `t` is a `T` and `T` conforms to `Helper`). - There is an obvious cleanup still to be done here where the same exact logic should be used to look up available "constructor" declarations inside a type when the type is used like a function. - Add a notion of subtype constraint "wittnesses" to the type system. When a generic is declared as taking `<T : Helper>` it really takes two generic parameters: the type `T` and a proof that `T` conforms to `Helper`. The actual arguments to a generic will then include both the type argument and a suitable witness argument (both type-level values). - As it stands right now, a witness wraps a `DeclRef` to the declaration that represents the appropriate subtype relationship. So if we have `struct A : Helper`, that `: Helper` part turns into an `InheritanceDecl` member, and a reference to that member can serve as a witness to the fact that `A` conforms to `Helper`. - Make explicit generic application `G<A,B>` synthesize the additional arguments that represent conformances required by the generic. - This does *not* yet deal with the case where a generic is implicitly specialized as part of an ordinary call `G(a,b)` - A bug fix to not auto-specialize generics during lookup. The problem here was related to an attempted fix of an earlier issue. During checking of a method nested in a generic type, we were running into problems where `DeclRefType::create()` was getting called on an un-specialized reference to `vector`, and this was leading to a crash when the code looked for the arguments for the generic. This was worked around by having name lookup automatically specialize any generics it runs into while going through lookup contexts. That choice creates the problem that in a generic method like this: ``` void test<T>(T val) { ... } ``` any reference to `val` inside the body of `test` will end up getting specialized so that it is effectively `test<T>::val`, when that isn't really needed. - Add front-end logic to check that when a type claims to conform to an interface it actually must provide the methods required by the interface. The checking process goes ahead and builds a front-end "witness table" that maps declarations in the interface being conformed to over to their concrete implementations for the type. - At the moment the checking is completely broken and bad: it assumes that *any* member with the right name is an appropriate declaration to satisfy a requirement. That obviously needs to be fixed. - Add an explicit operation to the IR for lookup of methods: `lookup_interface_method(w, r)` where `w` is a reference to the "witness" value and `r` is an `IRDeclRef` for the member we want to look up. - Add an explicit notion of witness tables to the IR. These end up being the IR representation of an `InheritanceDecl` in a type, and they are generated by enumerating the members that satisfy the interface requirements (which were handily already enumerated by the front-end checking). The witness table is an explicit IR value, and so it will be referenced/used at the site where conformance is being exploited (e.g., as part of a `specialize` call), so it should be safe to eliminate witness tables that are unused (since they represent conformances that aren't actually exploited). Similarly, the entries in a witness table are uses of the functions that implement interface methods, and so keep those live. - In order to implement the above, I did a bit of a cleanup pass on the IR representation so that there is an `IRUser` base that `IRInst` inherits from, so that we can have users of values that aren't instructions. - One annoying thing is that because of how types and generics are handled in the IR, we needed a way to have a type-level `Val` that wraps an IR-level value: e.g., to allow an IR-level witness table to be used as one of the arguments for specialization of a generic. The design I chose here is to have a "proxy" `Val` subclass (`IRProxyVal`) that wraps an `IRValue*`. These should only ever appear as part of types and `DeclRef`s that are used by the IR. - One annoying bit here is that an IR value might then have a use that is not manifest in the set of IR instructions, and instead only appears as part of a type somewhere. - I'm not 100% happy with this design, but it seems like we'd have to tackle similar issues if/when we eventually allow functions to have `constexpr` or `@Constant` parameters - Make generic specialization also propagate witness table arguments through to their use sites (this is mostly just the existing substitution machinery, once we have `IRProxyVal`), and then include logic to specialize `lookup_interface_method` instructions when their first operand is a concrete witness table. All of this work allows a single limited test using generics with constraints to pass, but more work is needed to make the solution robust.
2017-10-25Merge pull request #230 from csyonghe/masterYong He
Finish up implementation of render-test
2017-10-25ignore RENDER_COMPUTE test cases in linux build.YONGH\yongh
2017-10-25render-test code cleanupYONGH\yongh
2017-10-25fix d3d11 usageYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25testYONGH\yongh
2017-10-25add new test mode: COMPARE_RENDER_COMPUTE, which runs a input ↵YONGH\yongh
vertex/fragment shader pair, but instead of comparing the resulting framebuffer, it expects the test shader to write results into a UAV, and compares the pixel shader UAV output to the reference output.
2017-10-25Merge https://github.com/shader-slang/slangYONGH\yongh
2017-10-25finish up opengl renderer implementation for input resource binding.YONGH\yongh
2017-10-24Merge pull request #227 from csyonghe/masterYong He
Extending render-test to support various resource inputs
2017-10-23bug fixYong He
2017-10-23test 7Yong He
2017-10-23test 6Yong He